summaryrefslogtreecommitdiff
path: root/setup_native/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-09-06 12:31:17 +0000
committerKurt Zenker <kz@openoffice.org>2007-09-06 12:31:17 +0000
commit086e130132a91e9b351df026c165a3e6f0102f37 (patch)
tree78b66dcb5be3a420d9f588c26cf66919867c89a1 /setup_native/source
parent9eb88381c98ef47c158b7ee5b054ac77b2cf83ef (diff)
INTEGRATION: CWS mingwport06 (1.3.48); FILE MERGED
2007/08/24 13:12:57 vg 1.3.48.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native/source')
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
index 77e4741fafda..0d326efcaba6 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
@@ -6,9 +6,13 @@
#include "registryexception.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
//////////////////////////////////////////////////////////////////////
// Konstruktion/Destruktion