1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
This file is part of mingw-cross-env.
See doc/index.html for further information.
diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
--- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/configure.in 2010-01-23 14:15:24.000000000 +0100
@@ -89,6 +89,8 @@
AC_ISC_POSIX
+AC_CHECK_TOOL([AR], [ar], [:])
+
dnl Initialize libtool
AM_PROG_LIBTOOL
@@ -227,7 +229,6 @@
)
AC_CHECK_HEADERS( \
string \
- iomanip.h \
,,AC_MSG_ERROR([Missing a vital header file for id3lib])
)
@@ -251,7 +252,7 @@
AC_CHECK_FUNCS(mkstemp)
AC_CHECK_FUNCS(
truncate \
- ,,AC_MSG_ERROR([Missing a vital function for id3lib])
+ ,,AC_MSG_WARN([Missing a vital function for id3lib])
)
dnl Checks for typedefs, structures, and compiler characteristics.
diff -ru id3lib-3.8.3-orig/include/id3/globals.h id3lib-3.8.3/include/id3/globals.h
--- id3lib-3.8.3-orig/include/id3/globals.h 2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/include/id3/globals.h 2010-01-23 14:22:58.000000000 +0100
@@ -41,7 +41,7 @@
* we prefix variable declarations so they can
* properly get exported in windows dlls.
*/
-#ifdef WIN32
+#ifdef __MSVC_VER
# define LINKOPTION_STATIC 1 //both for use and creation of static lib
# define LINKOPTION_CREATE_DYNAMIC 2 //should only be used by prj/id3lib.dsp
# define LINKOPTION_USE_DYNAMIC 3 //if your project links id3lib dynamic
@@ -74,11 +74,11 @@
# define CCONV __stdcall // Added for VB & Delphi Compatibility - By FrogPrince Advised By Lothar
# endif
# endif
-#else /* !WIN32 */
+#else /* !__MSVC_VER */
# define ID3_C_EXPORT
# define ID3_CPP_EXPORT
# define CCONV
-#endif /* !WIN32 */
+#endif /* !__MSVC_VER */
#define ID3_C_VAR extern
diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100
@@ -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
diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100
@@ -30,7 +30,7 @@
#include "id3/writer.h"
#include "id3/id3lib_streams.h"
-//#include <string.h>
+#include <cstring>
class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
{
|
