diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-29 17:35:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-29 17:35:30 +0100 |
| commit | 68b6cbd75ee18de0ed40aae28785962714d8e3e4 (patch) | |
| tree | 833b516fe5c402b345cf1341a801129ae5f2a3cd | |
| parent | 92978fc5a8eeb5b3de6167f9f7eb215970bb3e34 (diff) | |
XMLSEC_NO_SIZE_T is /not/ used with MSVC
...where external/libxmlsec/ExternalProject_xmlsec.mk uses win32/configure.js
instead of configure. But that inconsistency generally got hidden on Windows by
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx including the raw xmlsec include
files instead of xmlsecurity/xmlsec-wrapper.h, so only gets noticed when using
--disable-pch (as is needed when building with clang-cl).
TODO: Don't know how to fix bin/update_pch so that precompiled_xsec_xmlsec.hxx
doesn't get broken again on the next update.
Change-Id: If385066a1e0f949d943aab7e9a5e969fbf0d0794
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 11 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 0de79b1623c5..acdec5a0f319 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -115,17 +115,8 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <xmloff/dllapi.h> -#include <xmlsec/base64.h> -#include <xmlsec/bn.h> -#include <xmlsec/errors.h> -#include <xmlsec/io.h> -#include <xmlsec/keysmngr.h> -#include <xmlsec/strings.h> -#include <xmlsec/xmldsig.h> -#include <xmlsec/xmlenc.h> -#include <xmlsec/xmlsec.h> -#include <xmlsec/xmltree.h> #include <xmlsecurity/biginteger.hxx> +#include <xmlsecurity/xmlsec-wrapper.h> // Cleanup windows header macro pollution. #if defined(_WIN32) && defined(WINAPI) diff --git a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h index 14f1d387105b..9d20cedd6b4a 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h @@ -24,8 +24,8 @@ #include <sal/types.h> -// Cf. xmlsec's configure.in: -#if SAL_TYPES_SIZEOFPOINTER != 4 +// Cf. xmlsec's configure.in (but which isn't used for MSVC): +#if !defined _MSC_VER && SAL_TYPES_SIZEOFPOINTER != 4 #define XMLSEC_NO_SIZE_T #endif |