diff options
| author | scito <info@scito.ch> | 2021-12-30 10:15:28 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-01-10 14:52:36 +0100 |
| commit | a787ae33c9c3c20043c89893859cafdc45061a3a (patch) | |
| tree | b2090815f08602c79ac6b363fb75f84ef7b21817 | |
| parent | a6814ad4ef5326c2d566a491291243db3af118cb (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
(cherry picked from commit 67fb363eed88b15eec7821fe604eb23d142d84cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128161
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | xmlsecurity/inc/xmlsec-wrapper.h | 4 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2 | ||||
| -rw-r--r-- | 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 0f145cd3def3..87af0f040866 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 e637785fe613..d95624fc2f08 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> |