diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:48:48 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:48:48 +0000 |
commit | dfab298b5acfde7e19a5a8ebd3c749f9734b7ea4 (patch) | |
tree | 4784cb20930ff6db83d99696a3706603df4e015b /cppuhelper/inc/cppuhelper/compbase2.hxx | |
parent | f33aad38ce8bf85148eccee561537aa6cf4083ab (diff) |
INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED
2003/07/14 15:18:45 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/inc/cppuhelper/compbase2.hxx')
-rw-r--r-- | cppuhelper/inc/cppuhelper/compbase2.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx index a92d826cab94..aecff8dfea70 100644 --- a/cppuhelper/inc/cppuhelper/compbase2.hxx +++ b/cppuhelper/inc/cppuhelper/compbase2.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase2.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:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,8 @@ #include <cppuhelper/implbase2.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> |