71198fe7d9
Allows dropping the xmlsec1-ecdsa-assert.patch.1 backport. Also fix the generated test certs + generator script to avoid expired certs for a while (.db files generated with Firefox 57.0). Change-Id: I8cba9a01633a3952c845e15e23b18d44544cdb59 Reviewed-on: https://gerrit.libreoffice.org/56123 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
40 lines
942 B
Groff
40 lines
942 B
Groff
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
|
|
|