From afc564da91bbdf4a008ba12e1de5fb0f8835fc1d Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 16 Jul 2003 16:52:12 +0000
Subject: INTEGRATION: CWS ooo11rc2 (1.10.12); FILE MERGED 2003/07/14 15:18:56
 fa 1.10.12.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16611

Dan
fa@ooo
---
 cppuhelper/source/implbase.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cppuhelper')

diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index b02a48ab06de..9be5801c097c 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: vg $ $Date: 2003-07-11 10:41:51 $
+ *  last change: $Author: hr $ $Date: 2003-07-16 17:52:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,7 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-#if defined(MACOSX)
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
 // Initialize static template data here to break circular reference to libstatic
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-- 
cgit