diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:35:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:35:20 +0000 |
| commit | 1e64b56beb4be972f3801f8498adb750c4c430f4 (patch) | |
| tree | ea935eb0250718073cfab349d91060dcc08ebfd7 /setup_native | |
| parent | 3da8d52c6d4aff34e3dab9383dd91bfdd5fc05e3 (diff) | |
INTEGRATION: CWS mingwport06 (1.6.40); FILE MERGED
2007/08/27 14:13:45 vg 1.6.40.1: #i75499# pragma for MSVC
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/shellextensions/postuninstall.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx index 2da81a82a49f..505ecf8aedb7 100755 --- a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx +++ b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx @@ -4,9 +4,9 @@ * * $RCSfile: postuninstall.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 10:50:22 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:35:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,11 +34,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> |