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

[David Ostrovsky]

 external/libxmlsec/xmlsec1-vc.patch |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

New commits:
commit 50f2c712c46c66264279ab3b61888e491a4d8dca
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Thu Sep 3 23:09:33 2015 +0200

    Fix libxmlsec on MSVC 14.0
    
    Change-Id: I37fd06bb0df1ad8f23eddc32b8eb5c93b2943fda
    Reviewed-on: https://gerrit.libreoffice.org/18327
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/external/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch
index 2a0f479..cd7914e 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 at 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 at 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
+