diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:33:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:33:29 +0000 |
| commit | 013f01bfe80b7b0d0c306c749d1673066edc3ef7 (patch) | |
| tree | 03109d4a7b5acd3239ac24cda84ccb1915eadf21 /setup_native | |
| parent | bab39708399ff305f04d58c964e74236897f850c (diff) | |
INTEGRATION: CWS mingwport06 (1.3.118); FILE MERGED
2007/08/24 13:12:58 vg 1.3.118.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx index 7878415c0737..4155be30dc82 100644 --- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx +++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx @@ -4,9 +4,9 @@ * * $RCSfile: regpatchactivex.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2006-06-20 03:41:05 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:33:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,10 +35,14 @@ #define UNICODE +#ifdef _MSC_VER #pragma warning(push,1) // disable warnings within system headers +#endif #include <windows.h> #include <msiquery.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <string.h> #include <malloc.h> |