Mercurial > mxe-octave
annotate src/msvc-libxml2-1.patch @ 4382:60e22de65ba4
maint: update dist-files.mk
* dist-files.mk: add build-lzip.mk, qt5.mk, qtbase.mk, qttools.mk, qtsvg.mk, qtimageformats.mk,
stable-octave-1-gnulib.patch, win7appid.mk, hg-octave-dist.mk
author | John D |
---|---|
date | Mon, 17 Apr 2017 14:21:42 -0400 |
parents | a684a0d16101 |
children |
rev | line source |
---|---|
3100
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur libxml2-2.9.0-orig/include/libxml/nanoftp.h libxml2-2.9.0/include/libxml/nanoftp.h |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- libxml2-2.9.0-orig/include/libxml/nanoftp.h 2012-09-10 23:52:46 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ libxml2-2.9.0/include/libxml/nanoftp.h 2013-06-26 18:41:33 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -16,7 +16,7 @@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 #ifdef LIBXML_FTP_ENABLED |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 /* Needed for portability to Windows 64 bits */ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 -#if defined(__MINGW32__) || defined(_WIN32_WCE) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 +#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(_MSC_VER) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 #include <winsock2.h> |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 #else |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 /** |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 diff -ur libxml2-2.9.0-orig/libxml-2.0.pc.in libxml2-2.9.0/libxml-2.0.pc.in |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 --- libxml2-2.9.0-orig/libxml-2.0.pc.in 2013-06-26 18:40:35 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 +++ libxml2-2.9.0/libxml-2.0.pc.in 2013-06-26 18:51:43 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 @@ -8,7 +8,6 @@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 Version: @VERSION@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 Description: libXML library version2. |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 Requires: |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 -Requires.private: liblzma |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 Libs: -L${libdir} -lxml2 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 diff -ur libxml2-2.9.0-orig/libxml.h libxml2-2.9.0/libxml.h |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 --- libxml2-2.9.0-orig/libxml.h 2012-09-10 23:52:46 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 +++ libxml2-2.9.0/libxml.h 2013-06-26 18:43:16 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 @@ -38,6 +38,10 @@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 #include <libxml/xmlversion.h> |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 #endif |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 +#ifdef _MSC_VER |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 +#define snprintf _snprintf |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 +#endif |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 + |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 #if defined(__Lynx__) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 #include <stdio.h> /* pull definition of size_t */ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 #include <varargs.h> |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 diff -ur libxml2-2.9.0-orig/nanoftp.c libxml2-2.9.0/nanoftp.c |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 --- libxml2-2.9.0-orig/nanoftp.c 2012-09-11 00:24:08 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 +++ libxml2-2.9.0/nanoftp.c 2013-06-26 18:41:15 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 @@ -77,7 +77,7 @@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 #endif |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 -#if defined(__MINGW32__) || defined(_WIN32_WCE) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 +#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(_MSC_VER) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 #ifndef _WINSOCKAPI_ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 #define _WINSOCKAPI_ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 #endif |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 diff -ur libxml2-2.9.0-orig/nanohttp.c libxml2-2.9.0/nanohttp.c |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 --- libxml2-2.9.0-orig/nanohttp.c 2012-09-11 00:23:25 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 +++ libxml2-2.9.0/nanohttp.c 2013-06-26 18:41:03 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 @@ -74,7 +74,7 @@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 #define XML_SOCKLEN_T unsigned int |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 #endif |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 -#if defined(__MINGW32__) || defined(_WIN32_WCE) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 +#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(_MSC_VER) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 #ifndef _WINSOCKAPI_ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 #define _WINSOCKAPI_ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 #endif |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 diff -ur libxml2-2.9.0-orig/testC14N.c libxml2-2.9.0/testC14N.c |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 --- libxml2-2.9.0-orig/testC14N.c 2012-09-11 00:24:08 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 +++ libxml2-2.9.0/testC14N.c 2013-06-26 18:46:07 -0400 |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
65 @@ -12,7 +12,7 @@ |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 #include <stdio.h> |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 #include <string.h> |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 #ifndef STDOUT_FILENO |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 -#ifdef HAVE_UNISTD_H |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 +#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER) |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 #include <unistd.h> |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 #else |
a684a0d16101
[MSVC] enable libxml2 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
73 #define STDOUT_FILENO fileno(stdout) |