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

[David Ostrovsky]

 external/libxslt/UnpackedTarball_xslt.mk |    1 +
 external/libxslt/libxslt-vc15.patch      |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit dacdb66fd52380caa079cd8eac61bb9b01bcfe4c
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Jul 4 22:41:26 2015 +0200

    Libxslt: Fix compilation on VS 2015
    
    Change-Id: Icb7f7cb20f5e2b200442bbc2d2bd4eb540170045
    Reviewed-on: https://gerrit.libreoffice.org/16761
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk
index b81cd1d..5c44e0e 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 0000000..47b0708
--- /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