From 511056fa1609d523206ce995c42555451b59e80b Mon Sep 17 00:00:00 2001
From: scito <info@scito.ch>
Date: Thu, 30 Dec 2021 10:15:28 +0100
Subject: tdf#146392 fix --enable-pch=full build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

x509.h includes cert.h. But that doesn't know of LO using
xmlsecurity/source/xmlsec/nss/nssrenam.h, which has a "#define
CERT_DecodeDERCertificate __CERT_DecodeDERCertificate". So the PCH
doesn't know of this rename and the compiler fails.

move the include line into the file that needs it and the --enable-pch=full
build works ok

Change-Id: I247bd219cf47964490ded439ad51bd8e8e120c48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127744
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 67fb363eed88b15eec7821fe604eb23d142d84cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128162
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 xmlsecurity/inc/xmlsec-wrapper.h                               | 4 ----
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2 ++
 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx         | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
index cc149379c36b..e4048de94bf2 100644
--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@@ -42,10 +42,6 @@
 #include <xmlsec/nss/app.h>
 #include <xmlsec/nss/crypto.h>
 #include <xmlsec/nss/pkikeys.h>
-#include <xmlsec/nss/x509.h>
-#endif
-#ifdef XMLSEC_CRYPTO_MSCRYPTO
-#include <xmlsec/mscng/x509.h>
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 824139464fbb..3abca3ae1659 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -22,6 +22,8 @@
 #include <rtl/uuid.h>
 #include <xmlsec-wrapper.h>
 
+#include <xmlsec/mscng/x509.h>
+
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
 #include <com/sun/star/xml/crypto/XXMLSignature.hpp>
 
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index fde4b747e932..975c17272dc7 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -20,6 +20,8 @@
 #include <sal/config.h>
 #include <xmlsec-wrapper.h>
 
+#include <xmlsec/nss/x509.h>
+
 #include <xmlelementwrapper_xmlsecimpl.hxx>
 #include <xmlsec/xmlstreamio.hxx>
 #include <xmlsec/errorcallback.hxx>
-- 
cgit