Mercurial > mxe-octave
annotate src/id3lib-1-win32.patch @ 3634:3b4116a23496
of-netcdf: update to 1.0.5
* src/of-netcdf.mk: update version,checksum
* build_packages.m: update netcdf
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 30 Jun 2014 20:34:29 -0400 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
972
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
3 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
4 diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
5 --- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
6 +++ id3lib-3.8.3/configure.in 2010-01-23 14:15:24.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
7 @@ -89,6 +89,8 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
8 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
9 AC_ISC_POSIX |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
10 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
11 +AC_CHECK_TOOL([AR], [ar], [:]) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
12 + |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
13 dnl Initialize libtool |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
14 AM_PROG_LIBTOOL |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
15 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
16 @@ -227,7 +229,6 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
17 ) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
18 AC_CHECK_HEADERS( \ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
19 string \ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
20 - iomanip.h \ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
21 ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
22 ) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
23 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
24 @@ -251,7 +252,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
25 AC_CHECK_FUNCS(mkstemp) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
26 AC_CHECK_FUNCS( |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
27 truncate \ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
28 - ,,AC_MSG_ERROR([Missing a vital function for id3lib]) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
29 + ,,AC_MSG_WARN([Missing a vital function for id3lib]) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
30 ) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
31 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
32 dnl Checks for typedefs, structures, and compiler characteristics. |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
33 diff -ru id3lib-3.8.3-orig/include/id3/globals.h id3lib-3.8.3/include/id3/globals.h |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
34 --- id3lib-3.8.3-orig/include/id3/globals.h 2003-03-02 01:23:00.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
35 +++ id3lib-3.8.3/include/id3/globals.h 2010-01-23 14:22:58.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
36 @@ -41,7 +41,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
37 * we prefix variable declarations so they can |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
38 * properly get exported in windows dlls. |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
39 */ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
40 -#ifdef WIN32 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
41 +#ifdef __MSVC_VER |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
42 # define LINKOPTION_STATIC 1 //both for use and creation of static lib |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
43 # define LINKOPTION_CREATE_DYNAMIC 2 //should only be used by prj/id3lib.dsp |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
44 # define LINKOPTION_USE_DYNAMIC 3 //if your project links id3lib dynamic |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
45 @@ -74,11 +74,11 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
46 # define CCONV __stdcall // Added for VB & Delphi Compatibility - By FrogPrince Advised By Lothar |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
47 # endif |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
48 # endif |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
49 -#else /* !WIN32 */ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
50 +#else /* !__MSVC_VER */ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
51 # define ID3_C_EXPORT |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
52 # define ID3_CPP_EXPORT |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
53 # define CCONV |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
54 -#endif /* !WIN32 */ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
55 +#endif /* !__MSVC_VER */ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
56 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
57 #define ID3_C_VAR extern |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
58 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
59 diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
60 --- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
61 +++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
62 @@ -30,6 +30,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
63 #define _ID3LIB_STRINGS_H_ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
64 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
65 #include <string> |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
66 +#include <cstring> |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
67 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
68 #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
69 namespace std |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
70 diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
71 --- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
72 +++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
73 @@ -30,7 +30,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
74 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
75 #include "id3/writer.h" |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
76 #include "id3/id3lib_streams.h" |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
77 -//#include <string.h> |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
78 +#include <cstring> |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
79 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
80 class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
81 { |