diff options
| -rw-r--r-- | external/xmlsec/UnpackedTarball_xmlsec.mk | 1 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 | 39 |
2 files changed, 0 insertions, 40 deletions
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk index 9e861cc394b6..f62207fd5b3e 100644 --- a/external/xmlsec/UnpackedTarball_xmlsec.mk +++ b/external/xmlsec/UnpackedTarball_xmlsec.mk @@ -10,7 +10,6 @@ xmlsec_patches := xmlsec_patches += xmlsec1-configure.patch.1 xmlsec_patches += xmlsec1-vc.patch.1 -xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1 # Backport of <https://github.com/lsh123/xmlsec/pull/192>. xmlsec_patches += mscng-fixes.patch.1 # Backport of <https://github.com/lsh123/xmlsec/pull/197>. diff --git a/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 b/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 deleted file mode 100644 index e09c455e4026..000000000000 --- a/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 +++ /dev/null @@ -1,39 +0,0 @@ -From 0e49768aca7371f247dc8eea849b2bc6e77a9c9c Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <vmiklos@collabora.co.uk> -Date: Fri, 4 Mar 2016 16:12:48 +0100 -Subject: [PATCH] xmlsec1-1.2.14_fix_extern_c.patch - -Conflicts: - include/xmlsec/xmlsec.h ---- - include/xmlsec/xmlsec.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h -index 71523197..4e13ea8d 100644 ---- a/include/xmlsec/xmlsec.h -+++ b/include/xmlsec/xmlsec.h -@@ -11,16 +11,16 @@ - #ifndef __XMLSEC_H__ - #define __XMLSEC_H__ - --#ifdef __cplusplus --extern "C" { --#endif /* __cplusplus */ -- - #include <libxml/tree.h> - - #include <xmlsec/version.h> - #include <xmlsec/exports.h> - #include <xmlsec/strings.h> - -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ - /*********************************************************************** - * - * Basic types to make ports to exotic platforms easier --- -2.16.3 - |