| commit | 67fb363eed88b15eec7821fe604eb23d142d84cc | [log] |
|---|---|---|
| author | scito <info@scito.ch> | Thu Dec 30 10:15:28 2021 +0100 |
| committer | Caolán McNamara <caolanm@redhat.com> | Thu Jan 06 17:34:05 2022 +0100 |
| tree | a534d252e27c2f75ba684706f30c0df67a0d6a50 | |
| parent | 9067b827f013caafc61ef3d0d63305572a320ee2 [diff] |
tdf#146392 fix --enable-pch=full build 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
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index cc14937..e4048de 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 0f145cd..87af0f0 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 9257771..94e84a7 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>