diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-10 20:47:58 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 10:55:41 +0000 |
| commit | 1a494d9a00208eef790400bdbd8b3e5c7fed4886 (patch) | |
| tree | 9e305bbf11be0aacfa3af942a7c250f423b629a9 /include/systools | |
| parent | d7801c39826f2f24f7340e1b25809d3bb65d6099 (diff) | |
Windows header sanitization
Isolation of windows headers using prewin.h
and postwin.h headers and making headers
dependent on them more self contained.
Conversion of TCHAR to WCHAR and
LPCTSTR to LPCWSTR etc. and cleanup
of unnecessary casts.
Change-Id: I7eff5c477d9223a064bfb4d962ff6d61960ee69c
Reviewed-on: https://gerrit.libreoffice.org/19901
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/systools')
| -rw-r--r-- | include/systools/win32/qswin32.h | 6 | ||||
| -rw-r--r-- | include/systools/win32/uwinapi.h | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/systools/win32/qswin32.h b/include/systools/win32/qswin32.h index f32b69e6df42..3cee187e6818 100644 --- a/include/systools/win32/qswin32.h +++ b/include/systools/win32/qswin32.h @@ -32,10 +32,16 @@ # define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW # define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW # define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW +# ifndef FindWindow +# define FindWindow FindWindowW +# endif #else # define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA # define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA # define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA +# ifndef FindWindow +# define FindWindow FindWindowA +# endif #endif #endif // INCLUDED_SYSTOOLS_WIN32_QSWIN32_H diff --git a/include/systools/win32/uwinapi.h b/include/systools/win32/uwinapi.h index db2faead0c29..cf89806f87fb 100644 --- a/include/systools/win32/uwinapi.h +++ b/include/systools/win32/uwinapi.h @@ -27,15 +27,8 @@ # define _SHELL32_ #endif -#ifndef _WINDOWS_ -#ifdef _MSC_VER -# pragma warning(push,1) /* disable warnings within system headers */ -#endif -# include <windows.h> -#ifdef _MSC_VER -# pragma warning(pop) -#endif -#endif +#include "prewin.h" +#include "postwin.h" #ifdef __MINGW32__ #include <basetyps.h> |