diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:33:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:33:01 +0000 |
| commit | 6cb388bd4605de67062d24ddcf114a7df1061927 (patch) | |
| tree | 202f884732fe6849cfc635b93095e840ef4764b3 | |
| parent | b5f538e1b9d4cb6f1fb2dcc6ffb45c912ce58144 (diff) | |
INTEGRATION: CWS mingwport06 (1.2.118); FILE MERGED
2007/08/24 13:12:57 vg 1.2.118.1: #i75499# pragma is for MSVC
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx | 4 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx index 4449fbb68c72..b31b66dbdf32 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx @@ -6,9 +6,13 @@ #include "registryvalueimpl.hxx" #endif +#ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ +#endif #include <windows.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <malloc.h> #include <assert.h> diff --git a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx index 309b37cfee89..a99259d8f0bd 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx +++ b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx @@ -5,9 +5,13 @@ #ifndef _WINDOWSREGISTRY_HXX_ #define _WINDOWSREGISTRY_HXX_ +#ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ +#endif #include <windows.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include "Registry.hxx" |