diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-04 21:46:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-06 21:54:26 +0000 |
| commit | 51b7970292b724e658a61ddcc79b138b4865c667 (patch) | |
| tree | 8c9ecf79de1c9ca31f5794bdef98f147cd07cd76 /external | |
| parent | c12c1b15eaa2310b1e04d0585c009e7c9bf45793 (diff) | |
Libxml2: Fix compilation on VS 2015
Change-Id: Ia2bb2897bc3fdb04c89f3328718f32fecd30eb64
Reviewed-on: https://gerrit.libreoffice.org/16760
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxml2/UnpackedTarball_xml2.mk | 1 | ||||
| -rw-r--r-- | external/libxml2/libxml2-vc15.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk index beed009c414a..66659b026577 100644 --- a/external/libxml2/UnpackedTarball_xml2.mk +++ b/external/libxml2/UnpackedTarball_xml2.mk @@ -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 --git a/external/libxml2/libxml2-vc15.patch b/external/libxml2/libxml2-vc15.patch new file mode 100644 index 000000000000..bdb9bb14db2c --- /dev/null +++ b/external/libxml2/libxml2-vc15.patch @@ -0,0 +1,13 @@ +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 |