diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:28:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:28:02 +0000 |
| commit | 96bcab6c8eb9f855bf0e8b6e7f016f23f706e947 (patch) | |
| tree | 451d007cd88a3cbdae7f150f45954961a8a78ee3 | |
| parent | 156e34966e0d779054f324ee3eb8e326ed7ebca4 (diff) | |
INTEGRATION: CWS mingwport06 (1.17.40); FILE MERGED
2007/08/24 13:12:56 vg 1.17.40.1: #i75499# pragma is for MSVC
| -rwxr-xr-x | setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index 3d4bcadb2ecd..75cd6b82f57a 100755 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -4,9 +4,9 @@ * * $RCSfile: swappatchfiles.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 10:49:25 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:28:02 $ * * 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> #include <assert.h> |