INTEGRATION: CWS mingwport06 (1.6.18); FILE MERGED

2007/08/24 13:12:57 vg 1.6.18.1: #i75499# pragma is for MSVC
2007-09-06 12:30:08 +00:00 · 2007-09-06 12:30:08 +00:00 · 62887fa98e
commit 62887fa98e
parent c56ec7d0e5
1 changed files with 2 additions and 0 deletions
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@ -19,7 +19,9 @@
 #endif

 #include <assert.h>
+#ifdef _MSC_VER
 #pragma warning(disable: 4350 4482)
+#endif

 const int MSWORD                     = 0x1;
 const int MSEXCEL                    = 0x2;