diff options
| author | scito <info@scito.ch> | 2021-12-30 10:15:28 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-01-10 17:39:46 +0100 |
| commit | 511056fa1609d523206ce995c42555451b59e80b (patch) | |
| tree | 8f0baea9b655f34d9acc2d76fccf6a71b679e25c /xmlsecurity/inc | |
| parent | 0dec041cb8156afb4d022d94c4c6a1d9fa222f91 (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/+/128162
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'xmlsecurity/inc')
| -rw-r--r-- | xmlsecurity/inc/xmlsec-wrapper.h | 4 |
1 files changed, 0 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: */ |