diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:09:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:09:31 +0000 |
| commit | 05427f1e603052e4d85f80d2cd97d8b1f1936fab (patch) | |
| tree | 34d8b83f3e7f41574d3d36e8d9383a6c07550729 /cppuhelper | |
| parent | b1e8b754eddd8c68801266687d9bfc7179a643c5 (diff) | |
INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED
2004/01/29 15:09:15 hr 1.8.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase5.hxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx index 6948a1bf34bc..125e5b8888a7 100644 --- a/cppuhelper/inc/cppuhelper/compbase5.hxx +++ b/cppuhelper/inc/cppuhelper/compbase5.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase5.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:48:57 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:09:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,17 +65,6 @@ #include <cppuhelper/implbase5.hxx> #endif -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -/* use old impl helpers for macosx */ - -#ifndef _CPPUHELPER_COMPBASE_HXX_ -#include <cppuhelper/compbase.hxx> -#endif - -__DEF_COMPIMPLHELPER( 5 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_COMPBASE_EX_HXX_ #include <cppuhelper/compbase_ex.hxx> #endif @@ -188,6 +177,4 @@ namespace cppu }; } -#endif /* MACOSX */ - #endif |