From c8b33cfbcdafd11327ed2e66c68c12780d4c6a7b Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 16 Jul 2003 16:51:51 +0000
Subject: [PATCH] INTEGRATION: CWS ooo11rc2 (1.20.12); FILE MERGED 2003/07/14
 15:18:55 fa 1.20.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/component_context.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 79159e042036..e59644328f7f 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: component_context.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-15 16:34:22 $
+ *  last change: $Author: hr $ $Date: 2003-07-16 17:51:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -332,7 +332,7 @@ static inline void try_dispose( Reference< lang::XComponent > const & xComp )
 
 //==================================================================================================
 
-#if defined(MACOSX)
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
 // Initialize static template data here to break circular reference to libstatic
 ClassData1 WeakImplHelper1< lang::XEventListener >::s_aCD(1);
 #endif
@@ -382,7 +382,7 @@ struct MutexHolder
 };
 //==================================================================================================
 
-#if defined(MACOSX)
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
 // Initialize static template data here to break circular reference to libstatic
 ClassData1 WeakComponentImplHelper1< XComponentContext >::s_aCD(1);
 #endif