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 /connectivity | |
| 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 'connectivity')
| -rw-r--r-- | connectivity/inc/pch/precompiled_ado.hxx | 9 | ||||
| -rw-r--r-- | connectivity/inc/pch/precompiled_odbc.hxx | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 22018806b9f7..1f4b17ca83ad 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.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:28 using: + Generated on 2015-12-02 12:47:53 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -69,8 +69,9 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> -// Prevent windows header macro pollution. -#undef OPTIONAL -#undef DELETE +// Cleanup windows header macro pollution. +#ifdef WNT +# include <postwin.h> +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_odbc.hxx b/connectivity/inc/pch/precompiled_odbc.hxx index 05804081d956..94aeae5accb1 100644 --- a/connectivity/inc/pch/precompiled_odbc.hxx +++ b/connectivity/inc/pch/precompiled_odbc.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:28 using: + Generated on 2015-12-02 12:47:53 using: ./bin/update_pch connectivity odbc --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -22,8 +22,6 @@ #include <algorithm> #include <cstddef> -#include <stddef.h> -#include <stdlib.h> #include <string.h> #include <boost/type_traits/is_same.hpp> #include <boost/type_traits/remove_reference.hpp> @@ -38,10 +36,8 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/config.h> -#include <sal/macros.h> #include <sal/saldllapi.h> #include <sal/types.h> -#include <sal/typesizes.h> #include <salhelper/singletonref.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> |