summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-07-04 22:41:26 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-06 21:54:49 +0000
commitdacdb66fd52380caa079cd8eac61bb9b01bcfe4c (patch)
tree80a982779ff46a8c3b8756d50b33d6a9cc127c77
parent51b7970292b724e658a61ddcc79b138b4865c667 (diff)
Libxslt: Fix compilation on VS 2015
Change-Id: Icb7f7cb20f5e2b200442bbc2d2bd4eb540170045 Reviewed-on: https://gerrit.libreoffice.org/16761 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--external/libxslt/UnpackedTarball_xslt.mk1
-rw-r--r--external/libxslt/libxslt-vc15.patch13
2 files changed, 14 insertions, 0 deletions
diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk
index b81cd1d7a1c2..5c44e0ec479a 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
$(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \
external/libxslt/libxslt-config-guess.patch.0 \
external/libxslt/rpath.patch.0 \
+ external/libxslt/libxslt-vc15.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/libxslt-vc15.patch b/external/libxslt/libxslt-vc15.patch
new file mode 100644
index 000000000000..47b070883234
--- /dev/null
+++ b/external/libxslt/libxslt-vc15.patch
@@ -0,0 +1,13 @@
+diff -ur xslt.org/libxslt/win32config.h xslt/libxslt/win32config.h
+--- misc/xslt/libxslt/win32config.h 2015-07-04 22:36:52.522061462 +0200
++++ misc/xslt/libxslt/win32config.h 2015-07-04 22:37:33.023064181 +0200
+@@ -79,7 +79,9 @@
+ #include <direct.h>
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+ #define mkdir(p,m) _mkdir(p)
++#if _MSC_VER < 1900
+ #define snprintf _snprintf
++#endif
+ #if _MSC_VER < 1500
+ #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+ #endif