summaryrefslogtreecommitdiff
path: root/expat
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2009-11-16 08:53:37 +0000
committerCaolán McNamara <cmc@openoffice.org>2009-11-16 08:53:37 +0000
commit052c9229f72b43dd44f6fba196d6c087c5c4deac (patch)
tree1fb897122f13c76992a15537d1a58d85e3e0432b /expat
parentdd7c21a410e0d1217e34dc07af7820004d5724be (diff)
#i106889# tweak api defs under windows
Diffstat (limited to 'expat')
-rw-r--r--expat/expat-winapi.patch13
-rw-r--r--expat/makefile.mk3
2 files changed, 15 insertions, 1 deletions
diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch
new file mode 100644
index 000000000000..dfac519f2ed2
--- /dev/null
+++ b/expat/expat-winapi.patch
@@ -0,0 +1,13 @@
+--- misc/expat-2.0.1/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000
++++ misc/build/expat-2.0.1/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000
+@@ -7,10 +7,6 @@
+
+ /* External API definitions */
+
+-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
+-#define XML_USE_MSC_EXTENSIONS 1
+-#endif
+-
+ /* Expat tries very hard to make the API boundary very specifically
+ defined. There are two macros defined to control this boundary;
+ each of these can be defined before including this header to
diff --git a/expat/makefile.mk b/expat/makefile.mk
index 7b1e88880528..a7e9a6fe5d68 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -48,7 +48,8 @@ all:
TARFILE_NAME=expat-2.0.1
ADDITIONAL_FILES=lib$/makefile.mk
-PATCH_FILES=expat-2.0.1.patch
+PATCH_FILES=expat-2.0.1.patch \
+ expat-winapi.patch
CONFIGURE_DIR=
.IF "$(OS)"=="WNT"