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/inc | |
| 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/inc')
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 094d9a1740a9..4bf9b0023ca2 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2015-11-14 14:16:41 using: + Generated on 2015-12-02 12:42:58 using: ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -26,6 +26,7 @@ #include <cstring> #include <exception> #include <iomanip> +#include <memory> #include <new> #include <ostream> #include <pk11pub.h> @@ -117,4 +118,9 @@ #include <xmlsecurity/biginteger.hxx> #include <xmlsecurity/xmlsec-wrapper.h> +// Cleanup windows header macro pollution. +#ifdef WNT +# include <postwin.h> +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |