? .DS_Store Index: inc/ZipPackageFolder.hxx =================================================================== RCS file: /cvs/xml/package/inc/ZipPackageFolder.hxx,v retrieving revision 1.28 diff -u -r1.28 ZipPackageFolder.hxx --- inc/ZipPackageFolder.hxx 12 Jun 2003 10:12:59 -0000 1.28 +++ inc/ZipPackageFolder.hxx 10 Jul 2003 23:34:05 -0000 @@ -89,7 +89,7 @@ struct ZipEntry; typedef void* rtlRandomPool; -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) class ZipPackageFolder : public ZipPackageEntry, public ::cppu::OWeakObject, public ::com::sun::star::container::XNameContainer, @@ -125,7 +125,7 @@ throw(::com::sun::star::uno::RuntimeException); void releaseUpwardRef(); -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException); Index: source/zippackage/ZipPackageEntry.hxx =================================================================== RCS file: /cvs/xml/package/source/zippackage/ZipPackageEntry.hxx,v retrieving revision 1.9 diff -u -r1.9 ZipPackageEntry.hxx --- source/zippackage/ZipPackageEntry.hxx 20 Aug 2002 12:53:59 -0000 1.9 +++ source/zippackage/ZipPackageEntry.hxx 10 Jul 2003 23:34:05 -0000 @@ -88,7 +88,7 @@ class ZipPackageFolder; -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) class ZipPackageEntry : public com::sun::star::container::XNamed, public com::sun::star::container::XChild, public com::sun::star::lang::XUnoTunnel, @@ -126,7 +126,7 @@ { xParent.clear(); } -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException) = 0; Index: source/zippackage/ZipPackageFolder.cxx =================================================================== RCS file: /cvs/xml/package/source/zippackage/ZipPackageFolder.cxx,v retrieving revision 1.60 diff -u -r1.60 ZipPackageFolder.cxx --- source/zippackage/ZipPackageFolder.cxx 26 Mar 2003 14:13:49 -0000 1.60 +++ source/zippackage/ZipPackageFolder.cxx 10 Jul 2003 23:34:05 -0000 @@ -120,7 +120,7 @@ Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > (); -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) #include static ::cppu::OImplementationId * pId = 0; #endif @@ -138,7 +138,7 @@ aEntry.nOffset = -1; if ( !aImplementationId.getLength() ) { -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -174,7 +174,7 @@ rDest.nExtraLen = rSource.nExtraLen; } -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) Any SAL_CALL ZipPackageFolder::queryInterface( const Type& rType ) throw(RuntimeException) { Index: source/zippackage/ZipPackageStream.cxx =================================================================== RCS file: /cvs/xml/package/source/zippackage/ZipPackageStream.cxx,v retrieving revision 1.31 diff -u -r1.31 ZipPackageStream.cxx --- source/zippackage/ZipPackageStream.cxx 26 Mar 2003 14:13:49 -0000 1.31 +++ source/zippackage/ZipPackageStream.cxx 10 Jul 2003 23:34:05 -0000 @@ -85,7 +85,7 @@ Sequence < sal_Int8 > ZipPackageStream::aImplementationId = Sequence < sal_Int8 > (); -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) #include static ::cppu::OImplementationId * pId = 0; #endif @@ -113,7 +113,7 @@ if ( !aImplementationId.getLength() ) { -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -149,7 +149,7 @@ aEntry.nExtraLen = rInEntry.nExtraLen; } -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) //XInterface Any SAL_CALL ZipPackageStream::queryInterface( const Type& rType ) throw(RuntimeException) Index: source/zippackage/ZipPackageStream.hxx =================================================================== RCS file: /cvs/xml/package/source/zippackage/ZipPackageStream.hxx,v retrieving revision 1.12 diff -u -r1.12 ZipPackageStream.hxx --- source/zippackage/ZipPackageStream.hxx 20 Aug 2002 13:04:52 -0000 1.12 +++ source/zippackage/ZipPackageStream.hxx 10 Jul 2003 23:34:05 -0000 @@ -80,7 +80,7 @@ class ZipPackage; struct ZipEntry; -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) class ZipPackageStream : public ZipPackageEntry, public ::cppu::OWeakObject, public ::com::sun::star::io::XActiveDataSink @@ -154,7 +154,7 @@ return aImplementationId; } -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException);