summaryrefslogtreecommitdiff
path: root/UnoControls/source/base
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:53:07 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:53:07 +0000
commite32e46cdedfdd5ae88d00b2488f9812e664fb969 (patch)
treec44a6c03ff8b9798b6bbcde790b3d64a10ac81eb /UnoControls/source/base
parent1d70f64dda200a428d7e46fd56e3ab6c1e8ad7bc (diff)
INTEGRATION: CWS ooo11rc2 (1.3.4); FILE MERGED
2003/07/14 15:43:14 fa 1.3.4.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only. http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16696 Dan fa@ooo
Diffstat (limited to 'UnoControls/source/base')
-rw-r--r--UnoControls/source/base/registercontrols.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 5b03146d78c7..6aa2ecc0aa4d 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: registercontrols.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: vg $ $Date: 2003-06-12 10:43:48 $
+ * last change: $Author: hr $ $Date: 2003-07-16 17:53:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -233,7 +233,7 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
//******************************************************************************************************************************
-#ifdef MACOSX
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
@@ -252,7 +252,7 @@ using namespace ::com::sun::star::registry ;
#endif /* MACOSX */
//******************************************************************************************************************************
-#ifdef MACOSX
+#if defined( MACOSX ) && ( __GNUC__ < 3 )
#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \