Annotation of /trunk/id3lib/patches/id3lib-3.8.3-gcc43.patch
Parent Directory | Revision Log
Revision 872 -
(hide annotations)
(download)
Thu Jul 16 16:19:24 2009 UTC (15 years, 2 months ago) by niro
File size: 2971 byte(s)
Thu Jul 16 16:19:24 2009 UTC (15 years, 2 months ago) by niro
File size: 2971 byte(s)
-added security and build fixes
1 | niro | 872 | diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in |
2 | --- id3lib-3.8.3-orig/configure.in 2008-03-05 18:03:25.000000000 -0600 | ||
3 | +++ id3lib-3.8.3/configure.in 2008-03-05 18:15:42.000000000 -0600 | ||
4 | @@ -227,7 +227,6 @@ | ||
5 | ) | ||
6 | AC_CHECK_HEADERS( \ | ||
7 | string \ | ||
8 | - iomanip.h \ | ||
9 | ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) | ||
10 | ) | ||
11 | |||
12 | diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h | ||
13 | --- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2008-03-05 18:19:46.000000000 -0600 | ||
14 | +++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000 -0600 | ||
15 | @@ -30,6 +30,7 @@ | ||
16 | #define _ID3LIB_STRINGS_H_ | ||
17 | |||
18 | #include <string> | ||
19 | +#include <cstring> | ||
20 | |||
21 | #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) | ||
22 | namespace std | ||
23 | diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h | ||
24 | --- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-01 18:23:00.000000000 -0600 | ||
25 | +++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600 | ||
26 | @@ -30,7 +30,7 @@ | ||
27 | |||
28 | #include "id3/writer.h" | ||
29 | #include "id3/id3lib_streams.h" | ||
30 | -//#include <string.h> | ||
31 | +#include <string.h> | ||
32 | |||
33 | class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer | ||
34 | { | ||
35 | diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp | ||
36 | --- id3lib-3.8.3-orig/examples/demo_convert.cpp 2003-03-01 18:23:00.000000000 -0600 | ||
37 | +++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000 -0600 | ||
38 | @@ -84,7 +84,7 @@ | ||
39 | } | ||
40 | } | ||
41 | |||
42 | -int main( unsigned int argc, char * const argv[]) | ||
43 | +int main( int argc, char * const argv[]) | ||
44 | { | ||
45 | flags_t ulFlag = ID3TT_ALL; | ||
46 | gengetopt_args_info args; | ||
47 | diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp | ||
48 | --- id3lib-3.8.3-orig/examples/demo_info.cpp 2003-03-01 18:23:00.000000000 -0600 | ||
49 | +++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000 -0600 | ||
50 | @@ -309,7 +309,7 @@ | ||
51 | |||
52 | #define DEBUG | ||
53 | |||
54 | -int main( unsigned int argc, char * const argv[]) | ||
55 | +int main( int argc, char * const argv[]) | ||
56 | { | ||
57 | ID3D_INIT_DOUT(); | ||
58 | |||
59 | diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp | ||
60 | --- id3lib-3.8.3-orig/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000 -0600 | ||
61 | +++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600 | ||
62 | @@ -46,7 +46,7 @@ | ||
63 | os << "v2"; | ||
64 | } | ||
65 | |||
66 | -int main( unsigned int argc, char * const argv[]) | ||
67 | +int main( int argc, char * const argv[]) | ||
68 | { | ||
69 | int ulFlag = ID3TT_ID3; | ||
70 | ID3D_INIT_DOUT(); | ||
71 | diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp | ||
72 | --- id3lib-3.8.3-orig/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000 -0600 | ||
73 | +++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000 -0600 | ||
74 | @@ -81,7 +81,7 @@ | ||
75 | } | ||
76 | } | ||
77 | |||
78 | -int main( unsigned int argc, char * const argv[]) | ||
79 | +int main( int argc, char * const argv[]) | ||
80 | { | ||
81 | int ulFlag = ID3TT_ID3; | ||
82 | ID3D_INIT_DOUT(); |