diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-20 09:03:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-20 07:35:48 +0000 |
| commit | f7aa4344e4fec0e8bb49d6ba210bc3a78b7e1365 (patch) | |
| tree | 2dc5e84c6718a049c1226b3c971fb69a20a713e3 /external/libxmlsec/xmlsec1-vc.patch.1 | |
| parent | 6b7594a84eaff5594d019ecc0ad324ebaa6f760d (diff) | |
libxmlsec: split the upstreamed part of xmlsec1-vc.patch.1 into a new patch
Change-Id: I1a6201a21cdf3a42475487a42cd80d11cd5e42b6
Reviewed-on: https://gerrit.libreoffice.org/24253
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/libxmlsec/xmlsec1-vc.patch.1')
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch.1 | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1 index bf35001b0da0..8c249e80c89b 100644 --- a/external/libxmlsec/xmlsec1-vc.patch.1 +++ b/external/libxmlsec/xmlsec1-vc.patch.1 @@ -10,45 +10,6 @@ Subject: [PATCH] xmlsec1-vc.patch win32/Makefile.msvc | 10 +++++++++- 4 files changed, 12 insertions(+), 4 deletions(-) -diff --git a/apps/cmdline.c b/apps/cmdline.c -index b9ecafb..4425eaf 100644 ---- a/apps/cmdline.c -+++ b/apps/cmdline.c -@@ -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 --git a/apps/crypto.c b/apps/crypto.c -index 49dd127..f46eeee 100644 ---- a/apps/crypto.c -+++ b/apps/crypto.c -@@ -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 --git a/apps/xmlsec.c b/apps/xmlsec.c -index d551b5a..0467c25 100644 ---- a/apps/xmlsec.c -+++ b/apps/xmlsec.c -@@ -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 - diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index d833497..065595b 100644 --- a/win32/Makefile.msvc |