summaryrefslogtreecommitdiff
path: root/external/libxmlsec/xmlsec1-vc.patch.1
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-07-26 21:49:52 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-27 07:04:51 +0000
commit3efe880c3bb4504b0ee7ff8f425d6a91e441aa4d (patch)
treefa8fd11ec6f6c0e65ccf52afcda3f22aa0741857 /external/libxmlsec/xmlsec1-vc.patch.1
parente73c4d5013d7a0bf7d72db1773d7125ab91cf269 (diff)
libxmlsec: mark part of xmlsec1-vc.patch.1 as upstreamed
Change-Id: I4a8365c98eef87274ae1809047fd4ea582102f0b Reviewed-on: https://gerrit.libreoffice.org/27556 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.19
1 files changed, 0 insertions, 9 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1
index 117a031c5570..c4f9307b3b29 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -22,15 +22,6 @@ index 978336e..a474592 100644
!if "$(UNICODE)" == "1"
CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE"
-@@ -334,7 +338,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1
- !else
- !endif
-
--APP_CFLAGS = /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\""
-+CFLAGS = $(CFLAGS) /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\""
- !if "$(WITH_DL)" == "1"
- CFLAGS = $(CFLAGS) /D "XMLSEC_DL_WIN32"
- APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING"
@@ -365,7 +369,11 @@ LIBS =
!if "$(DEBUG)" == "1"
LDFLAGS = $(LDFLAGS) /DEBUG