diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-18 07:49:58 -0500 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-04 11:26:22 +0000 |
| commit | a027ed9573858f3ec6361577ff541d7f2495bd32 (patch) | |
| tree | 2cb6864e2b27f22af72d3d491e40e8f21d23699a /xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | |
| parent | 9e2973dbb90b5d9ce004cbf333f5000e4d50dc18 (diff) | |
Wingdi RGB macro handling improved
Improved the isolation of windows headers.
Specifically, RGB macro is better handled now.
Change-Id: I0eeea16d0de9da3455810c80b0715f7b54ae8c3f
Reviewed-on: https://gerrit.libreoffice.org/20039
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss/nssinitializer.cxx')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 2ddcb83fae5d..b903c38592e4 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -22,16 +22,15 @@ * and turn off the additional virtual methods which are part of some interfaces when compiled * with debug */ -#ifdef DEBUG #undef DEBUG -#endif - #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> #include <cppuhelper/supportsservice.hxx> +// RGB is leaked macro from wingdi.h which conflicts in Office/Common.hxx. +#undef RGB #include <officecfg/Office/Common.hxx> #include <sal/types.h> |