From 430ab74fac84abce089c2313a01475b22a8ba149 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 16 Jul 2003 16:50:58 +0000
Subject: [PATCH] INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED 2003/07/14
 15:18:50 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/implbase3.hxx | 7 ++++---
 cppuhelper/inc/cppuhelper/implbase4.hxx | 7 ++++---
 cppuhelper/inc/cppuhelper/implbase5.hxx | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx
index 601f12e690c5..9436000f97cd 100644
--- a/cppuhelper/inc/cppuhelper/implbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase3.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase3.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:50:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,7 +61,8 @@
 #ifndef _CPPUHELPER_IMPLBASE3_HXX_
 #define _CPPUHELPER_IMPLBASE3_HXX_
 
-#ifdef MACOSX /* use old impl helpers for macosx */
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
+/* use old impl helpers for macosx */
 
 #define __IFC3 Ifc1, Ifc2, Ifc3
 #define __CLASS_IFC3 class Ifc1, class Ifc2, class Ifc3
diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx
index ddc535da1e33..59c056b85d3a 100644
--- a/cppuhelper/inc/cppuhelper/implbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase4.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase4.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:50:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,7 +61,8 @@
 #ifndef _CPPUHELPER_IMPLBASE4_HXX_
 #define _CPPUHELPER_IMPLBASE4_HXX_
 
-#ifdef MACOSX /* use old impl helpers for macosx */
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
+/* use old impl helpers for macosx */
 
 #define __IFC4 Ifc1, Ifc2, Ifc3, Ifc4
 #define __CLASS_IFC4 class Ifc1, class Ifc2, class Ifc3, class Ifc4
diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx
index e10f6f57c0ec..7e5203585824 100644
--- a/cppuhelper/inc/cppuhelper/implbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase5.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase5.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:50:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,7 +61,8 @@
 #ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #define _CPPUHELPER_IMPLBASE5_HXX_
 
-#ifdef MACOSX /* use old impl helpers for macosx */
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
+/* use old impl helpers for macosx */
 
 #define __IFC5 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5
 #define __CLASS_IFC5 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5