From ec52e5e5a204862905b555cdc1f7393aede1f7d8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 24 Mar 2013 10:47:54 +0100 Subject: Consolidate XMLSEC_NO_SIZE_T setting in xmlsecurity/xmlsec-wrapper.h ...so all xmlsec/*.h includes are bundled there now (except, for pragmatic reasons, the xmlsec/mscrypto/*.h ones that unconditionally include windows.h and only work on Windows). Change-Id: I33e642f4f6a2e40edd6950af7f209c8b76c6e5fe --- xmlsecurity/source/xmlsec/biginteger.cxx | 8 +------- xmlsecurity/source/xmlsec/errorcallback.cxx | 8 +------- .../source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 9 ++------- .../source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2 +- .../source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 2 +- .../source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 5 +---- .../source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 4 +--- .../source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 4 +--- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 11 +---------- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 7 +------ xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 10 +--------- xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 9 +-------- xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 9 +-------- xmlsecurity/source/xmlsec/xmlstreamio.cxx | 7 +------ 14 files changed, 15 insertions(+), 80 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index 20ea493a9b0a..652e130f845d 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -20,13 +20,7 @@ #include -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include -#include +#include "xmlsecurity/xmlsec-wrapper.h" #include using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index ec8436faa113..b2dcf6a6df12 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -23,13 +23,7 @@ */ #include "errorcallback.hxx" -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include "xmlsec/xmlsec.h" -#include "xmlsec/errors.h" +#include "xmlsecurity/xmlsec-wrapper.h" using namespace ::com::sun::star::xml::crypto; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 1420b025d885..c1b2194efc4d 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -35,16 +35,11 @@ #include "x509certificate_mscryptimpl.hxx" #include -#include -#include -#include -#include +#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec/mscrypto/akmngr.h" #include -#include "xmlsec/keysmngr.h" -#include "xmlsec/mscrypto/akmngr.h" - #include #include #include diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index bc2ab88e5453..e721b36c176b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -46,7 +46,7 @@ #include #include -#include "xmlsec/xmlsec.h" +#include "xmlsecurity/xmlsec-wrapper.h" #include "sal/types.h" diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index 5dc73528fc8e..9f69255fe98f 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -22,7 +22,7 @@ #include "securityenvironment_mscryptimpl.hxx" -#include "xmlsec/strings.h" +#include "xmlsecurity/xmlsec-wrapper.h" #include "xmlsec/mscrypto/app.h" namespace cssu = com::sun::star::uno; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 7757f162f637..2addf5505c63 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -29,10 +29,7 @@ #include "securityenvironment_mscryptimpl.hxx" #include "errorcallback.hxx" -#include "xmlsec/xmlsec.h" -#include "xmlsec/xmltree.h" -#include "xmlsec/xmlenc.h" -#include "xmlsec/crypto.h" +#include "xmlsecurity/xmlsec-wrapper.h" #ifdef UNX #define stricmp strcasecmp diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index 02f02c07207a..1aa241ad9a1a 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -23,9 +23,7 @@ #include "xmlsecuritycontext_mscryptimpl.hxx" #include "xmlstreamio.hxx" -#include "xmlsec/xmlsec.h" -#include "xmlsec/keysmngr.h" -#include "xmlsec/crypto.h" +#include "xmlsecurity/xmlsec-wrapper.h" #include "xmlsec/mscrypto/akmngr.h" using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index d18ee4e9a347..73a17612ea7d 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -27,9 +27,7 @@ #include "securityenvironment_mscryptimpl.hxx" #include "xmlstreamio.hxx" #include "errorcallback.hxx" -#include "xmlsec/xmlsec.h" -#include "xmlsec/xmldsig.h" -#include "xmlsec/crypto.h" +#include "xmlsecurity/xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index f3eacea08c16..8201fadbd0c5 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -29,16 +29,7 @@ #include #include "../diagnose.hxx" -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include -#include -#include -#include -#include +#include "xmlsecurity/xmlsec-wrapper.h" #include #include diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 75fa7fc4292a..c8c0be10b4eb 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -44,12 +44,7 @@ #include "certdb.h" #include "list" -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include "xmlsec/xmlsec.h" +#include "xmlsecurity/xmlsec-wrapper.h" class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::xml::crypto::XSecurityEnvironment , diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 85dfb93190cf..6e04c9decc31 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -28,15 +28,7 @@ #include "securityenvironment_nssimpl.hxx" #include "errorcallback.hxx" -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include "xmlsec/xmlsec.h" -#include "xmlsec/xmltree.h" -#include "xmlsec/xmlenc.h" -#include "xmlsec/crypto.h" +#include "xmlsecurity/xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 60fe6b0289e8..a53955db733e 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -24,14 +24,7 @@ #include "xmlsecuritycontext_nssimpl.hxx" #include "xmlstreamio.hxx" -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include "xmlsec/xmlsec.h" -#include "xmlsec/keysmngr.h" -#include "xmlsec/crypto.h" +#include "xmlsecurity/xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 32e7548af46d..97fdb27454c5 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -31,14 +31,7 @@ #include "xmlstreamio.hxx" #include "errorcallback.hxx" -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include "xmlsec/xmlsec.h" -#include "xmlsec/xmldsig.h" -#include "xmlsec/crypto.h" +#include "xmlsecurity/xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 08237c40f31c..43a8d6ace97f 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -26,12 +26,7 @@ #include "rtl/uri.hxx" #include -#include -//For reasons that escape me, this is what xmlsec does when size_t is not 4 -#if SAL_TYPES_SIZEOFPOINTER != 4 -# define XMLSEC_NO_SIZE_T -#endif -#include +#include "xmlsecurity/xmlsec-wrapper.h" #define XMLSTREAMIO_INITIALIZED 0x01 #define XMLSTREAMIO_REGISTERED 0x02 -- cgit