diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:29:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:29:29 +0000 |
| commit | f437b3fea296eb3511672e9d1b754168767ffe76 (patch) | |
| tree | 2bfe07316e62c0f61dde877cffcc72121d037adb /setup_native/source | |
| parent | 0140c3cf86a35c51c70f09376198960befa6c421 (diff) | |
INTEGRATION: CWS mingwport06 (1.5.90); FILE MERGED
2007/08/24 13:12:57 vg 1.5.90.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/register.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/register.cxx b/setup_native/source/win32/customactions/reg4msdoc/register.cxx index d66c7665b4a6..3e6e0fc2d001 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/register.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/register.cxx @@ -4,9 +4,9 @@ * * $RCSfile: register.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2006-09-25 13:06:05 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:29:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,14 +61,20 @@ #include "msihelper.hxx" #endif +#ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #pragma warning(disable: 4917) +#endif #include <shlobj.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <assert.h> +#ifdef _MSC_VER #pragma warning(disable: 4350) +#endif typedef std::auto_ptr<Registrar> RegistrarPtr; |