bin/update_pch | 1 + connectivity/inc/pch/precompiled_ado.hxx | 1 + sc/qa/unit/helper/debughelper.hxx | 1 + sc/qa/unit/ucalc_formula.cxx | 3 --- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 1 + xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 4 ---- 6 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit b8ecfd83bac98ea58a435c59856da8fd94f5c6d9 Author: Stephan Bergmann <[email protected]> Date: Mon Dec 7 08:38:12 2015 +0100 Undef RGB where it was defined, not where it gets used Change-Id: I274958964292f78c802748e17fca7f265ae5a4b8 Reviewed-on: https://gerrit.libreoffice.org/20429 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/bin/update_pch b/bin/update_pch index 47c2d15..a21b069 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -762,6 +762,7 @@ def generate(includes, libname, filename, module): // Cleanup windows header macro pollution. #ifdef WNT # include <postwin.h> +# undef RGB #endif """ f.write(ado_define) diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 1f4b17c..5e7ce61 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -72,6 +72,7 @@ // Cleanup windows header macro pollution. #ifdef WNT # include <postwin.h> +# undef RGB #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx index 509f4af..0143d6e 100644 --- a/sc/qa/unit/helper/debughelper.hxx +++ b/sc/qa/unit/helper/debughelper.hxx @@ -21,6 +21,7 @@ #include <prewin.h> #include <postwin.h> #undef NOMINMAX +#undef RGB #endif #include <iostream> diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index b5eafc2..69b46bb 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -29,9 +29,6 @@ #include <docpool.hxx> #include <formula/vectortoken.hxx> - -// RGB is leaked macro from wingdi.h which conflicts in Office/Common.hxx. -#undef RGB #include <officecfg/Office/Common.hxx> #include <svl/broadcast.hxx> diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 4bf9b00..49dce9e 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -121,6 +121,7 @@ // Cleanup windows header macro pollution. #ifdef WNT # include <postwin.h> +# undef RGB #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index b903c38..136c8d6 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -28,11 +28,7 @@ #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> #include <rtl/instance.hxx> #include <rtl/bootstrap.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
