diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:35:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:35:34 +0000 |
| commit | 7f3eaa8683b80e3fab792051b42d624860d5d109 (patch) | |
| tree | b3cdd5c228f8b644e5e38a3d538ecc06dd86336d /setup_native | |
| parent | 1e64b56beb4be972f3801f8498adb750c4c430f4 (diff) | |
INTEGRATION: CWS mingwport06 (1.6.2); FILE MERGED
2007/08/27 14:13:45 vg 1.6.2.1: #i75499# pragma for MSVC
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx index 8c21136144a4..3a5cc6743fbd 100644 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx @@ -4,9 +4,9 @@ * * $RCSfile: registerextensions.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-08-17 11:49:06 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:35:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,12 +38,16 @@ #define _WIN32_WINDOWS 0x0410 +#ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <msiquery.h> #include <shellapi.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <malloc.h> #include <assert.h> |