Re: Build failure with latest ICU 64.1

Hi,

On Fri, Mar 29, 2019 at 12:43:41PM +0100, Andreas Sturmlechner <asturm@gentoo.org> wrote:
> (this is from system-xmlsec-1.2.27)

Can you see if the attached patch helps? If so, we can get it merged
upstream.

Thanks,

Miklos

From d0c7516dd97599fb59d8616e8adf94f19ec48de1 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Fri, 29 Mar 2019 13:47:12 +0100
Subject: [PATCH] base64: move start of C++ guard below includes

Resolves problems around building against newer ICU, see
<https://lists.freedesktop.org/archives/libreoffice/2019-March/082340.html>.
---
 include/xmlsec/base64.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/xmlsec/base64.h b/include/xmlsec/base64.h
index 36d8a493..7e13862f 100644
--- a/include/xmlsec/base64.h
+++ b/include/xmlsec/base64.h
@@ -11,15 +11,15 @@
 #ifndef __XMLSEC_BASE64_H__
 #define __XMLSEC_BASE64_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <libxml/tree.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/transforms.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * XMLSEC_BASE64_LINESIZE:
  *
-- 
2.16.4

Attachment: signature.asc
Description: Digital signature