diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:36:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:36:50 +0000 |
| commit | 91232b0149b297e290acc32471900e4d79650d0f (patch) | |
| tree | 0b9a7e479c70c1b1e9828f794670c8917aa2d6ef /package/inc | |
| parent | 9e82bbf1ba91424cce3eeeedef0e08b738a63447 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.28.8); FILE MERGED
2003/07/14 15:38:24 fa 1.28.8.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
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ZipPackageFolder.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 7c0dccaf8a3f..e2583f71e0e9 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.hxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: vg $ $Date: 2003-06-12 10:12:59 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:36:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ class ZipOutputStream; 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 @@ public: 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); |