diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:49:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:49:52 +0000 |
| commit | 6922dfe20e78de0564dd91188c0aadb84903064d (patch) | |
| tree | db75769d6653d0894ccc640fbd7f28f300c92cef /sal/systools | |
| parent | 045f2471c81499d13ab4ec7599a91382b37fe473 (diff) | |
INTEGRATION: CWS mingwport06 (1.7.62); FILE MERGED
2007/08/24 13:06:54 vg 1.7.62.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal/systools')
| -rw-r--r-- | sal/systools/win32/uwinapi/DllMain.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp index 38bd960e9cfa..d40b4353a805 100644 --- a/sal/systools/win32/uwinapi/DllMain.cpp +++ b/sal/systools/win32/uwinapi/DllMain.cpp @@ -4,9 +4,9 @@ * * $RCSfile: DllMain.cpp,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:26:11 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:49:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,9 +34,13 @@ ************************************************************************/ #define WIN32_LEAN_AND_MEAN +#ifdef _MSC_VER #pragma warning(push,1) // disable warnings within system headers +#endif #include <windows.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <malloc.h> #define _MBCS #include <tchar.h> |