summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-06-26 14:20:02 +0200
committerAndras Timar <andras.timar@collabora.com>2017-01-05 13:50:34 +0100
commitb59ed531416ee5cb3d8ee8a33be0a06424d659f6 (patch)
treec0ce805e8dbd063c7090166532123ec27bac4d3f
parent4bcadb95a3eabe0ca64de3b6478e1bff679987cc (diff)
expat: remove duplicate patch
Change-Id: Ie813234b78b9f8d2c61c9640546317d754f66004
-rw-r--r--external/expat/UnpackedTarball_expat.mk2
-rw-r--r--external/expat/expat-2.1.0.patch13
2 files changed, 1 insertions, 14 deletions
diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk
index 1ea97b584251..60e933d76090 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat))
$(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,expat,\
- external/expat/expat-2.1.0.patch \
+ external/expat/expat-winapi.patch \
))
# This is a bit hackish.
diff --git a/external/expat/expat-2.1.0.patch b/external/expat/expat-2.1.0.patch
deleted file mode 100644
index 070dafc0cb0c..000000000000
--- a/external/expat/expat-2.1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000
-+++ misc/build/expat-2.1.0/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