INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED

2003/07/14 15:18:51 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
This commit is contained in:
Jens-Heiner Rechtien
2003-07-16 16:51:29 +00:00
parent 430ab74fac
commit 8157cbda0f
3 changed files with 12 additions and 9 deletions

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase6.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:51:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,7 +61,8 @@
#ifndef _CPPUHELPER_IMPLBASE6_HXX_
#define _CPPUHELPER_IMPLBASE6_HXX_
#ifdef MACOSX /* use old impl helpers for macosx */
#if defined( MACOSX ) && ( __GNUC__ < 3 )
/* use old impl helpers for macosx */
#define __IFC6 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6
#define __CLASS_IFC6 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase7.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:51:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,7 +61,8 @@
#ifndef _CPPUHELPER_IMPLBASE7_HXX_
#define _CPPUHELPER_IMPLBASE7_HXX_
#ifdef MACOSX /* use old impl helpers for macosx */
#if defined( MACOSX ) && ( __GNUC__ < 3 )
/* use old impl helpers for macosx */
#define __IFC7 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7
#define __CLASS_IFC7 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase8.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:51:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,7 +61,8 @@
#ifndef _CPPUHELPER_IMPLBASE8_HXX_
#define _CPPUHELPER_IMPLBASE8_HXX_
#ifdef MACOSX /* use old impl helpers for macosx */
#if defined( MACOSX ) && ( __GNUC__ < 3 )
/* use old impl helpers for macosx */
#define __IFC8 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8
#define __CLASS_IFC8 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8