diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-09-03 23:09:33 +0200 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-09-04 04:57:50 +0000 |
| commit | 50f2c712c46c66264279ab3b61888e491a4d8dca (patch) | |
| tree | 07eceda169494835f67dad36c4c81d4c50be2e60 /external | |
| parent | 9a8a4442fd6368c20cf6a3d7efa3bd42962ee12f (diff) | |
Fix libxmlsec on MSVC 14.0
Change-Id: I37fd06bb0df1ad8f23eddc32b8eb5c93b2943fda
Reviewed-on: https://gerrit.libreoffice.org/18327
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch index 2a0f479e0618..cd7914e5e6c4 100644 --- a/external/libxmlsec/xmlsec1-vc.patch +++ b/external/libxmlsec/xmlsec1-vc.patch @@ -26,3 +26,39 @@ # Optimisation and debug symbols. !if "$(DEBUG)" == "1" +diff -ru xmlsec.orig/apps/cmdline.c xmlsec/apps/cmdline.c +--- build/xmlsec.orig/apps/cmdline.c 2009-12-05 22:19:17.000000000 +0100 ++++ build/xmlsec/apps/cmdline.c 2015-09-03 23:05:01.003150300 +0200 +@@ -7,7 +7,7 @@ + * + * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com> + */ +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) && _MSC_VER < 1900 + #define snprintf _snprintf + #endif + +diff -ru xmlsec.orig/apps/crypto.c xmlsec/apps/crypto.c +--- build/xmlsec.orig/apps/crypto.c 2009-12-05 22:19:17.000000000 +0100 ++++ build/xmlsec/apps/crypto.c 2015-09-03 23:04:36.928472100 +0200 +@@ -7,7 +7,7 @@ + * + * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com> + */ +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) && _MSC_VER < 1900 + #define snprintf _snprintf + #endif + +diff -ru xmlsec.orig/apps/xmlsec.c xmlsec/apps/xmlsec.c +--- build/xmlsec.orig/apps/xmlsec.c 2009-12-05 22:19:17.000000000 +0100 ++++ build/xmlsec/apps/xmlsec.c 2015-09-03 23:05:08.057636300 +0200 +@@ -9,7 +9,7 @@ + #include <string.h> + #include <time.h> + +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) && _MSC_VER < 1900 + #define snprintf _snprintf + #endif + |