From 62887fa98ecf975241094892603cc12b7878469a Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 6 Sep 2007 12:30:08 +0000 Subject: [PATCH] INTEGRATION: CWS mingwport06 (1.6.18); FILE MERGED 2007/08/24 13:12:57 vg 1.6.18.1: #i75499# pragma is for MSVC --- setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx index 726389c72b4a..11d073e4451f 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx @@ -19,7 +19,9 @@ #endif #include +#ifdef _MSC_VER #pragma warning(disable: 4350 4482) +#endif const int MSWORD = 0x1; const int MSEXCEL = 0x2;