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