From 091ccabfa7083e0667d43b7e1045adf1a38c0a9f Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 16 Jul 2003 16:49:14 +0000
Subject: [PATCH] INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED 2003/07/14
 15:18:46 fa 1.7.16.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/inc/cppuhelper/compbase5.hxx | 7 ++++---
 cppuhelper/inc/cppuhelper/compbase6.hxx | 7 ++++---
 cppuhelper/inc/cppuhelper/compbase7.hxx | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx
index b4891619535c..6948a1bf34bc 100644
--- a/cppuhelper/inc/cppuhelper/compbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase5.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: compbase5.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: hr $ $Date: 2003-07-16 17:48:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,8 @@
 #include <cppuhelper/implbase5.hxx>
 #endif
 
-#ifdef MACOSX /* use old impl helpers for macosx */
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
+/* use old impl helpers for macosx */
 
 #ifndef _CPPUHELPER_COMPBASE_HXX_
 #include <cppuhelper/compbase.hxx>
diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx
index 95046e259274..f6e8d2772aa5 100644
--- a/cppuhelper/inc/cppuhelper/compbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase6.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: compbase6.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: hr $ $Date: 2003-07-16 17:49:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,8 @@
 #include <cppuhelper/implbase6.hxx>
 #endif
 
-#ifdef MACOSX /* use old impl helpers for macosx */
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
+/* use old impl helpers for macosx */
 
 #ifndef _CPPUHELPER_COMPBASE_HXX_
 #include <cppuhelper/compbase.hxx>
diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
index 0c1f00fc5971..d74875033f03 100644
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase7.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: compbase7.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: hr $ $Date: 2003-07-16 17:49:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,8 @@
 #include <cppuhelper/implbase7.hxx>
 #endif
 
-#ifdef MACOSX /* use old impl helpers for macosx */
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
+/* use old impl helpers for macosx */
 
 #ifndef _CPPUHELPER_COMPBASE_HXX_
 #include <cppuhelper/compbase.hxx>