diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-08-30 00:58:30 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-08-30 00:58:30 (GMT) |
| commit | 262aa647f04db4aac22a7301a5b22e0a08c01be6 (patch) | |
| tree | a286337f657944774706f939a527b76f2fb7fd42 /src/id3lib-3-header.patch | |
| parent | 92a09aeae43765202caf4152a6b4fa8902c1a386 (diff) | |
| parent | 0e50d664f4efce912ee1a4ee62168c661d6f9199 (diff) | |
| download | mxe-262aa647f04db4aac22a7301a5b22e0a08c01be6.zip mxe-262aa647f04db4aac22a7301a5b22e0a08c01be6.tar.gz mxe-262aa647f04db4aac22a7301a5b22e0a08c01be6.tar.bz2 | |
Merge branch 'stable'
Conflicts:
Makefile
src/gd.mk
src/gdal.mk
src/imagemagick.mk
src/pcl.mk
src/qt.mk
Diffstat (limited to 'src/id3lib-3-header.patch')
| -rw-r--r-- | src/id3lib-3-header.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/id3lib-3-header.patch b/src/id3lib-3-header.patch new file mode 100644 index 0000000..1eaa5c6 --- /dev/null +++ b/src/id3lib-3-header.patch @@ -0,0 +1,23 @@ +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 + {
\ No newline at end of file |