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 /include | |
| 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 'include')
| -rw-r--r-- | include/prewin.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/include/prewin.h b/include/prewin.h index d64d517bc6fe..e7ad06975d44 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -24,33 +24,40 @@ #define Rectangle BLA_Rectangle #define Folder WIN_Folder #define GradientStyle_RECT WIN_GradientStyle_RECT + #ifndef IN -#define IN +# define IN #endif #ifndef OUT -#define OUT +# define OUT #endif #if !defined STRICT -#define STRICT +# define STRICT #endif #ifdef _MSC_VER -#pragma warning(push, 1) -#pragma warning (disable: 4005) +# pragma warning(push, 1) +# pragma warning (disable: 4005) #endif + #include <windows.h> + #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif + #include <shellapi.h> #include <commdlg.h> #include <dlgs.h> + #ifdef _MSC_VER -#pragma warning(push, 1) +# pragma warning(push, 1) #endif + #include <commctrl.h> + #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif #endif |