diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:52:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:52:32 +0000 |
| commit | da0fb2fdd3d4c2129c171fb458ba405c3e2711d5 (patch) | |
| tree | 3fba33e136eee0af5e6a85f07d24807daa01e75d /cppuhelper | |
| parent | cffd33b24fb440b7012a6d9a64492bd0b309e177 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.9.48); FILE MERGED
2003/07/14 15:18:57 fa 1.9.48.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/propshlp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 982e0750a69f..48c8d601fba6 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propshlp.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2002-08-15 13:03:02 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:52:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,7 +107,7 @@ int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 * The class which implements the PropertySetInfo interface. */ -#if defined(MACOSX) +#if defined( MACOSX ) && ( __GNUC__ < 3 ) // Initialize static template data here to break circular reference to libstatic ClassData1 WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >::s_aCD(1); #endif |