diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:14:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:14:02 +0000 |
| commit | c286b8ce6611310cbf344890006095cdad0ea32d (patch) | |
| tree | 8461e7d29d2b5fb4611c11a2cf7ddaa62d992607 | |
| parent | 7ca1e8a23058a6fb86324ced55389ea60774aa22 (diff) | |
INTEGRATION: CWS mingwport06 (1.2.60); FILE MERGED
2007/08/27 14:34:48 vg 1.2.60.1: #i75499# pragma for MSVC
| -rw-r--r-- | tools/inc/tools/prewin.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/inc/tools/prewin.h b/tools/inc/tools/prewin.h index d22d15a54986..d694dbf49d1f 100644 --- a/tools/inc/tools/prewin.h +++ b/tools/inc/tools/prewin.h @@ -4,9 +4,9 @@ * * $RCSfile: prewin.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 20:15:14 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:14:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,9 +58,13 @@ extern "C" { #endif #define STRICT +#ifdef _MSC_VER #pragma warning(push, 1) +#endif #include <windows.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <shellapi.h> #include <commdlg.h> #include <dlgs.h> @@ -73,8 +77,12 @@ extern "C" { #ifdef INCLUDE_MMSYSTEM #include <mmsystem.h> #endif +#ifdef _MSC_VER #pragma warning(push, 1) +#endif #include <commctrl.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #endif |