? .DS_Store
Index: source/classes/imagewrapper.cxx
===================================================================
RCS file: /cvs/framework/framework/source/classes/imagewrapper.cxx,v
retrieving revision 1.1
diff -u -r1.1 imagewrapper.cxx
--- source/classes/imagewrapper.cxx	4 Dec 2001 07:43:35 -0000	1.1
+++ source/classes/imagewrapper.cxx	15 Jul 2003 06:01:34 -0000
@@ -93,14 +93,14 @@
 {
 
 //MACOSX moved outside of class above
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
     static sal_uInt8 pGUID[16] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 };
     static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
 #endif
 
 static Sequence< sal_Int8 > impl_getStaticIdentifier()
 {
-#ifndef MACOSX
+#if !(defined(MACOSX) && (__GNUC__ < 3))
     //MACOSX moved outside of class above
     static sal_uInt8 pGUID[16] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 };
     static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
Index: source/classes/rootactiontriggercontainer.cxx
===================================================================
RCS file: /cvs/framework/framework/source/classes/rootactiontriggercontainer.cxx,v
retrieving revision 1.2
diff -u -r1.2 rootactiontriggercontainer.cxx
--- source/classes/rootactiontriggercontainer.cxx	10 Dec 2001 13:21:24 -0000	1.2
+++ source/classes/rootactiontriggercontainer.cxx	15 Jul 2003 06:01:34 -0000
@@ -91,14 +91,14 @@
 {
 
 //MACOSX moved outside of class above
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
     static sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 };
     static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
 #endif
 
 static Sequence< sal_Int8 > impl_getStaticIdentifier()
 {
-#ifndef MACOSX
+#if !(defined(MACOSX) && (__GNUC__ < 3))
     //MACOSX moved outside of class above
     static sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 };
     static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
Index: source/threadhelp/transactionmanager.cxx
===================================================================
RCS file: /cvs/framework/framework/source/threadhelp/transactionmanager.cxx,v
retrieving revision 1.4
diff -u -r1.4 transactionmanager.cxx
--- source/threadhelp/transactionmanager.cxx	19 Aug 2002 16:08:35 -0000	1.4
+++ source/threadhelp/transactionmanager.cxx	15 Jul 2003 06:01:34 -0000
@@ -369,7 +369,7 @@
         if( pManager == NULL )
         {
 // [ed] 6/16/02 Avoid static member data on OS X to work around compiler bugs
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
             // Create the new manager and set it for return on static variable.
             pManager = new TransactionManager();
 #else
Index: test/threadtest/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/test/threadtest/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- test/threadtest/makefile.mk	25 Mar 2003 18:22:04 -0000	1.3
+++ test/threadtest/makefile.mk	15 Jul 2003 06:01:34 -0000
@@ -87,7 +87,7 @@
 
 # [ed] 6/16/02 Add the transaction manager library on OS X
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 APP1OBJS+=	$(SLO)$/transactionmanager.obj
 .ENDIF
 
Index: test/typecfg/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/test/typecfg/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- test/typecfg/makefile.mk	25 Mar 2003 18:22:06 -0000	1.8
+++ test/typecfg/makefile.mk	15 Jul 2003 06:01:34 -0000
@@ -92,7 +92,7 @@
 				$(SLO)$/lockhelper.obj
 
 # [ed] 6/16/02 Add in the transactionmanager object on OS X
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 APP2OBJS+=	$(SLO)$/transactionmanager.obj
 .ENDIF
 
@@ -115,7 +115,7 @@
 				$(SLO)$/lockhelper.obj
 
 # [ed] 6/16/02 Add in the transactionmanager object on OS X
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 APP2DEPN+=	$(SLO)$/transactionmanager.obj
 .ENDIF