diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:46:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:46:11 +0000 |
| commit | 3f29f698dd8d0c5c9d848aa04c50486a74ab0b6d (patch) | |
| tree | 9206a7c923b086d2446c2c38d05a0066a260684e /sal/inc | |
| parent | aab9cf7c2e70ff0d4f8bec600f5ca315801acdf9 (diff) | |
INTEGRATION: CWS mingwport06 (1.7.62); FILE MERGED
2007/08/24 13:06:52 vg 1.7.62.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/systools/win32/uwinapi.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h index 6c0f4e4ad5b8..0857b9e0e616 100644 --- a/sal/inc/systools/win32/uwinapi.h +++ b/sal/inc/systools/win32/uwinapi.h @@ -4,9 +4,9 @@ * * $RCSfile: uwinapi.h,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:22:02 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:46:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,10 +42,14 @@ #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 #ifdef __MINGW32__ #include <basetyps.h> |