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