From 386a3879bfb2f3402b467825c689474931a31c50 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Thu, 6 Sep 2007 12:34:11 +0000
Subject: INTEGRATION: CWS mingwport06 (1.2.22); FILE MERGED 2007/08/27
 14:24:03 vg 1.2.22.1: #i75499# pragma for MSVC

---
 setup_native/source/win32/customactions/relnotes/relnotes.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'setup_native')

diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
index 77e68160ddb0..24ed14f0185e 100644
--- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: relnotes.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-06 14:33:04 $
+ *  last change: $Author: kz $ $Date: 2007-09-06 13:34:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,12 +33,16 @@
  *
  ************************************************************************/
 
+#ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
 #pragma warning(disable: 4917)
+#endif
 #include <windows.h>
 #include <msiquery.h>
 #include <shlobj.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif
 
 #include <string.h>
 #include <malloc.h>
-- 
cgit