40 lines
1.3 KiB
Text
40 lines
1.3 KiB
Text
$NetBSD: patch-aa,v 1.7 2013/04/29 21:13:30 joerg Exp $
|
|
|
|
* make gcc-4.3 compliant
|
|
http://id3lib.cvs.sourceforge.net/viewvc/id3lib/id3lib-devel/include/id3/id3lib_strings.h?r1=1.7&r2=1.8
|
|
* add missing arguments
|
|
* make gcc-3.4 compliant
|
|
|
|
--- include/id3/id3lib_strings.h.orig 2003-03-02 00:23:00.000000000 +0000
|
|
+++ include/id3/id3lib_strings.h
|
|
@@ -30,6 +30,7 @@
|
|
#define _ID3LIB_STRINGS_H_
|
|
|
|
#include <string>
|
|
+#include <cstring>
|
|
|
|
#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
|
|
namespace std
|
|
@@ -100,10 +101,10 @@ namespace std
|
|
|
|
static char_type
|
|
to_char_type(const int_type& __c)
|
|
- { return char_type(); }
|
|
+ { return char_type(__c); }
|
|
|
|
static int_type
|
|
- to_int_type(const char_type& __c) { return int_type(); }
|
|
+ to_int_type(const char_type& __c) { return int_type(__c); }
|
|
|
|
static bool
|
|
eq_int_type(const int_type& __c1, const int_type& __c2)
|
|
@@ -117,7 +118,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) && !defined(_LIBCPP_VERSION)
|
|
#if (defined(ID3_NEED_WCHAR_TEMPLATE))
|
|
template<>
|
|
struct char_traits<wchar_t>
|