mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED

Browse Source 
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
This commit is contained in:
Jens-Heiner Rechtien
2003-07-16 16:50:58 +00:00
parent 4706ee1a02
commit 430ab74fac
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cppuhelper/inc/cppuhelper/implbase3.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase3.hxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -61,7 +61,8 @@
#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #ifndef _CPPUHELPER_IMPLBASE3_HXX_
#define _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 __IFC3 Ifc1, Ifc2, Ifc3
#define __CLASS_IFC3 class Ifc1, class Ifc2, class Ifc3 #define __CLASS_IFC3 class Ifc1, class Ifc2, class Ifc3

7
cppuhelper/inc/cppuhelper/implbase4.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase4.hxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -61,7 +61,8 @@
#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #ifndef _CPPUHELPER_IMPLBASE4_HXX_
#define _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 __IFC4 Ifc1, Ifc2, Ifc3, Ifc4
#define __CLASS_IFC4 class Ifc1, class Ifc2, class Ifc3, class Ifc4 #define __CLASS_IFC4 class Ifc1, class Ifc2, class Ifc3, class Ifc4

7
cppuhelper/inc/cppuhelper/implbase5.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase5.hxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -61,7 +61,8 @@
#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #ifndef _CPPUHELPER_IMPLBASE5_HXX_
#define _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 __IFC5 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5
#define __CLASS_IFC5 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 #define __CLASS_IFC5 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5