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