summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjoerg <joerg>2006-01-11 16:41:45 +0000
committerjoerg <joerg>2006-01-11 16:41:45 +0000
commit8b78abaa22e0e0ab4f1ca1eede8fe4e5e0097044 (patch)
tree2a39d080a2e909e1d3fbe901988585ad85b6f928 /audio
parent7591a96b1ea89be1ff3b5ab876e737d088ac6859 (diff)
downloadpkgsrc-8b78abaa22e0e0ab4f1ca1eede8fe4e5e0097044.tar.gz
Get a newer local version of id3lib_strings.h, which works with GCC 3.4+.
Diffstat (limited to 'audio')
-rw-r--r--audio/taglib/files/id3lib_strings.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/audio/taglib/files/id3lib_strings.h b/audio/taglib/files/id3lib_strings.h
index f94dfc06420..7eb4f64e670 100644
--- a/audio/taglib/files/id3lib_strings.h
+++ b/audio/taglib/files/id3lib_strings.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-// $Id: id3lib_strings.h,v 1.2 2004/06/07 19:36:40 shannonjr Exp $
+// $Id: id3lib_strings.h,v 1.3 2006/01/11 16:41:45 joerg Exp $
// id3lib: a software library for creating and manipulating id3v1/v2 tags
// Copyright 1999, 2000 Scott Thomas Haug
@@ -117,7 +117,8 @@ namespace std
{ return eq_int_type(__c, eof()) ? int_type(0) : __c; }
};
-#ifndef _GLIBCPP_USE_WCHAR_T
+/* gcc-3.4 defines _GLIBCXX_USE_WCHAR_T instead of _GLIBCPP_USE_WCHAR_T */
+#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T)
#if (defined(ID3_NEED_WCHAR_TEMPLATE))
template<>
struct char_traits<wchar_t>
@@ -197,7 +198,7 @@ namespace dami
typedef std::basic_string<char> String;
typedef std::basic_string<unsigned char> BString;
typedef std::basic_string<wchar_t> WString;
-}
+};
#endif /* _ID3LIB_STRINGS_H_ */