summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:37:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:37:26 +0000
commit87c7cc0bb11466818c76d7df3e7a5620106cdac3 (patch)
treef75edeac99df5d4108d119f099548d26c040e2e8
parent776f6770d6a25adc8f023cacdcde0b6bba9cf296 (diff)
INTEGRATION: CWS ooo11rc2 (1.12.46); FILE MERGED
2003/07/14 15:38:27 fa 1.12.46.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only. http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16694 Dan fa@ooo
-rw-r--r--package/source/zippackage/ZipPackageStream.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index 5875e93eabe5..cd884b9b85e5 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageStream.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: hr $ $Date: 2002-08-20 13:04:52 $
+ * last change: $Author: hr $ $Date: 2003-07-16 17:37:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -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 @@ public:
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);