diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:36:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:36:06 +0000 |
| commit | fb490f7db1227cd1a9ca2cefb07991735d785e23 (patch) | |
| tree | b21690a56506bf753fa22ae2dd338b685b8ef13a /setup_native | |
| parent | 64890f8ed62c4aeb2e337caf12a42f9118f2859d (diff) | |
INTEGRATION: CWS mingwport06 (1.8.40); FILE MERGED
2007/08/24 13:12:58 vg 1.8.40.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index 683815b8b2ea..8267be09bcb0 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -4,9 +4,9 @@ * * $RCSfile: startmenuicon.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 10:50:55 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:36:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,11 +35,15 @@ #define _WIN32_WINDOWS 0x0410 +#ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <msiquery.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <malloc.h> |