diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:35:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:35:48 +0000 |
| commit | 64890f8ed62c4aeb2e337caf12a42f9118f2859d (patch) | |
| tree | a684d89c8dda3d98eb2ea3e15a7b81213259daeb /setup_native/source | |
| parent | 7f3eaa8683b80e3fab792051b42d624860d5d109 (diff) | |
INTEGRATION: CWS mingwport06 (1.5.118); FILE MERGED
2007/08/24 13:12:58 vg 1.5.118.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/shellextensions.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx index 11fe7e67aaa0..da88621d23bd 100644 --- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shellextensions.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2006-06-20 03:42:06 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:35:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,11 +79,15 @@ prviliges have no negative effect because the shell extensions will work anyhow. */ +#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> |