Kaydet (Commit) 51b79702 authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Michael Stahl

Libxml2: Fix compilation on VS 2015

Change-Id: Ia2bb2897bc3fdb04c89f3328718f32fecd30eb64
Reviewed-on: https://gerrit.libreoffice.org/16760Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst c12c1b15
......@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
external/libxml2/libxml2-icu.patch.0 \
external/libxml2/ubsan.patch.0 \
external/libxml2/libxml2-vc15.patch \
))
# vim: set noet sw=4 ts=4:
diff -ur xml2.org/include/win32config.h xml2/include/win32config.h
--- misc/xml2/include/win32config.h 2015-07-04 21:35:50.600013534 +0200
+++ misc/xml2/include/win32config.h 2015-07-04 21:36:12.455015001 +0200
@@ -95,7 +95,9 @@
#if defined(_MSC_VER)
#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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment