diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:07:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:07:38 +0000 |
| commit | 08a880dda494090339d3e11fdf3e3500ef927817 (patch) | |
| tree | 9ca8d2a41d238a789df3b1d4b6345cdf7715a1a4 /cppuhelper | |
| parent | b0dc338fcb37bcb5dbf1404459d78ca13fc81a19 (diff) | |
INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED
2004/01/29 15:09:05 hr 1.8.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase1.hxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx index 514335c463e7..eb1ed283f5a1 100644 --- a/cppuhelper/inc/cppuhelper/compbase1.hxx +++ b/cppuhelper/inc/cppuhelper/compbase1.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase1.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:47:56 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:07:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,17 +65,6 @@ #include <cppuhelper/implbase1.hxx> #endif -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -/* use old impl helpers for macosx */ - -#ifndef _CPPUHELPER_COMPBASE_HXX_ -#include <cppuhelper/compbase.hxx> -#endif - -__DEF_COMPIMPLHELPER( 1 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_COMPBASE_EX_HXX_ #include <cppuhelper/compbase_ex.hxx> #endif @@ -180,6 +169,4 @@ namespace cppu }; } -#endif /* MACOSX */ - #endif |