diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:52:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:52:12 +0000 |
| commit | afc564da91bbdf4a008ba12e1de5fb0f8835fc1d (patch) | |
| tree | ce59889e85a6efada2b78fafa2eca5eb9f86e182 /cppuhelper | |
| parent | 927e9697a0df177578ac7c9e237997358e272724 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.10.12); FILE MERGED
2003/07/14 15:18:56 fa 1.10.12.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/source/implbase.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index b02a48ab06de..9be5801c097c 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2003-07-11 10:41:51 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:52:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#if defined(MACOSX) +#if defined( MACOSX ) && ( __GNUC__ < 3 ) // Initialize static template data here to break circular reference to libstatic #include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> |