wok-4.x view id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch @ rev 3347
Up: mjpegtools (1.9.0) - Fix build and remove libiconv dep
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Thu Jun 11 16:37:35 2009 +0200 (2009-06-11) |
| parents | |
| children |
line source
1 --- id3lib-3.8.3/configure 2008-05-24 23:39:36.000000000 -0400
2 +++ id3lib-3.8.3/configure 2008-05-24 23:39:57.000000000 -0400
3 @@ -10296,8 +10296,7 @@
5 for ac_header in \
6 string \
7 - iomanip.h \
9 do
10 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12 --- id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:46.000000000 -0600
13 +++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000 -0600
14 @@ -30,6 +30,7 @@
15 #define _ID3LIB_STRINGS_H_
17 #include <string>
18 +#include <cstring>
20 #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
21 namespace std
22 --- id3lib-3.8.3/include/id3/writers.h 2003-03-01 18:23:00.000000000 -0600
23 +++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600
24 @@ -30,7 +30,7 @@
26 #include "id3/writer.h"
27 #include "id3/id3lib_streams.h"
28 -//#include <string.h>
29 +#include <string.h>
31 class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
32 {
33 --- id3lib-3.8.3/examples/demo_convert.cpp 2003-03-01 18:23:00.000000000 -0600
34 +++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000 -0600
35 @@ -84,7 +84,7 @@
36 }
37 }
39 -int main( unsigned int argc, char * const argv[])
40 +int main( int argc, char * const argv[])
41 {
42 flags_t ulFlag = ID3TT_ALL;
43 gengetopt_args_info args;
44 --- id3lib-3.8.3/examples/demo_info.cpp 2003-03-01 18:23:00.000000000 -0600
45 +++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000 -0600
46 @@ -309,7 +309,7 @@
48 #define DEBUG
50 -int main( unsigned int argc, char * const argv[])
51 +int main( int argc, char * const argv[])
52 {
53 ID3D_INIT_DOUT();
55 --- id3lib-3.8.3/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000 -0600
56 +++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600
57 @@ -46,7 +46,7 @@
58 os << "v2";
59 }
61 -int main( unsigned int argc, char * const argv[])
62 +int main( int argc, char * const argv[])
63 {
64 int ulFlag = ID3TT_ID3;
65 ID3D_INIT_DOUT();
66 --- id3lib-3.8.3/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000 -0600
67 +++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000 -0600
68 @@ -81,7 +81,7 @@
69 }
70 }
72 -int main( unsigned int argc, char * const argv[])
73 +int main( int argc, char * const argv[])
74 {
75 int ulFlag = ID3TT_ID3;
76 ID3D_INIT_DOUT();