diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:48:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:48:21 +0000 |
| commit | f33aad38ce8bf85148eccee561537aa6cf4083ab (patch) | |
| tree | a29d27c632f60a693e646eb54fd329b5cd6a24de /cppuhelper | |
| parent | 506434f9498b33b46fcf758e3064f9eea99744e6 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED
2003/07/14 15:18:44 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
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase10.hxx | 7 | ||||
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase11.hxx | 7 | ||||
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase12.hxx | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx index db2ba42f7db4..2a968aaf5fa1 100644 --- a/cppuhelper/inc/cppuhelper/compbase10.hxx +++ b/cppuhelper/inc/cppuhelper/compbase10.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase10.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:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,8 @@ #include <cppuhelper/implbase10.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/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx index b2d17d5fce02..5d2ad9fea352 100644 --- a/cppuhelper/inc/cppuhelper/compbase11.hxx +++ b/cppuhelper/inc/cppuhelper/compbase11.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase11.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:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,8 @@ #include <cppuhelper/implbase11.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/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx index 75208a200730..26e74ed093d9 100644 --- a/cppuhelper/inc/cppuhelper/compbase12.hxx +++ b/cppuhelper/inc/cppuhelper/compbase12.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase12.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:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,8 @@ #include <cppuhelper/implbase12.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> |