diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:33:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:33:15 +0000 |
| commit | bab39708399ff305f04d58c964e74236897f850c (patch) | |
| tree | 2b71036c3c22a2ed685dbf3a7dc67d6a423d8f28 /setup_native/source/win32/customactions/regactivex | |
| parent | 6cb388bd4605de67062d24ddcf114a7df1061927 (diff) | |
INTEGRATION: CWS mingwport06 (1.13.90); FILE MERGED
2007/08/24 13:12:57 vg 1.13.90.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native/source/win32/customactions/regactivex')
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index 52b7463a87d6..4d33083be87c 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -4,9 +4,9 @@ * * $RCSfile: regactivex.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2006-09-25 13:07:48 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:33:15 $ * * 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> |