Mercurial > mxe-octave
view src/id3lib-1-win32.patch @ 2661:3567da505594
json-c update to version 0.10, using github downloads.
Squashed commit of the following:
commit a93e1e80e4a6b668009bd024923e387f71eff7a3
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 23:16:59 2012 +0200
Patches for:
- missing file
- remove check for rpl_* functions
commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 19:08:40 2012 +0200
Fixed indentation
commit 78b51e08e5174454495b8df547c4bccdc06bef73
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 01:13:08 2012 +0200
json-c compiles correctly (finally).
commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab
Author: Thomas Mayer <thomas@residuum.org>
Date: Fri Jul 13 22:16:41 2012 +0200
Changes to json-c files according to current MXE standards.
commit a533fe5439d56de76c2d3b9d634c597cba94ff52
Author: Thomas Mayer <thomas@residuum.org>
Date: Thu Jul 12 22:27:54 2012 +0200
Update to json-c 0.10, and use github repository.
author | Thomas Mayer <thomas@residuum.org> |
---|---|
date | Tue, 17 Jul 2012 23:18:18 +0200 |
parents | 99516e73b368 |
children |
line wrap: on
line source
This file is part of MXE. See 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 {