diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:49:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:49:36 +0000 |
| commit | 045f2471c81499d13ab4ec7599a91382b37fe473 (patch) | |
| tree | 3477073bb275356550981dd8bfb6c3768b752747 /sal/systools | |
| parent | c2b72e47132e1daeee8f0863fe1c581b5a164c30 (diff) | |
INTEGRATION: CWS mingwport06 (1.5.138); FILE MERGED
2007/08/24 13:06:54 vg 1.5.138.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal/systools')
| -rw-r--r-- | sal/systools/win32/uwinapi/DllGetVersion.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp index 2342e0dcceec..6607496ec45e 100644 --- a/sal/systools/win32/uwinapi/DllGetVersion.cpp +++ b/sal/systools/win32/uwinapi/DllGetVersion.cpp @@ -4,9 +4,9 @@ * * $RCSfile: DllGetVersion.cpp,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2006-09-25 13:15:48 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:49:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,10 +34,14 @@ ************************************************************************/ #define WIN32_LEAN_AND_MEAN +#ifdef _MSC_VER #pragma warning(push,1) +#endif #include <windows.h> #include <shlwapi.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <malloc.h> extern HMODULE UWINAPI_BaseAddress; |