diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:36:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:36:21 +0000 |
| commit | 60e894990e38270fbae704b56d12a87ca6fd2517 (patch) | |
| tree | dd8b93fb6e258ee321a8059eec6e3f639b832f3b | |
| parent | fb490f7db1227cd1a9ca2cefb07991735d785e23 (diff) | |
INTEGRATION: CWS mingwport06 (1.6.40); FILE MERGED
2007/08/24 13:12:58 vg 1.6.40.1: #i75499# pragma is for MSVC
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/upgrade.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx index 262a85e21fcc..6f05ca153212 100644 --- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx +++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx @@ -4,9 +4,9 @@ * * $RCSfile: upgrade.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 10:52:56 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:36:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,11 +38,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> #include <assert.h> |