[Libreoffice-commits] core.git: external/expat

[Michael Stahl]

 external/expat/UnpackedTarball_expat.mk |    2 +-
 external/expat/expat-2.1.0.patch        |   13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 6d0a9ccffe57d0438f46ccd0f4e63c06a9e1c9eb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 26 14:20:02 2015 +0200

    expat: remove duplicate patch
    
    Change-Id: Ie813234b78b9f8d2c61c9640546317d754f66004

diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk
index 1ea97b5..60e933d 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 070dafc..0000000
--- 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