From df6c88813cf642de9e3b3d6b9ecf4e3dca3ca211 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 2 Feb 2004 22:10:38 +0000
Subject: INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED 2004/01/29 15:09:20
 hr 1.8.40.1: #111934#: merge CWS ooo111fix2

---
 cppuhelper/inc/cppuhelper/compbase9.hxx | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'cppuhelper')

diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
index dc4fc9ca4e5b..6f7aa88c2d08 100644
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase9.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: compbase9.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-07-16 17:49:32 $
+ *  last change: $Author: hr $ $Date: 2004-02-02 23:10: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/implbase9.hxx>
 #endif
 
-#if defined( MACOSX ) && ( __GNUC__ < 3 )
-/* use old impl helpers for macosx */
-
-#ifndef _CPPUHELPER_COMPBASE_HXX_
-#include <cppuhelper/compbase.hxx>
-#endif
-
-__DEF_COMPIMPLHELPER( 9 )
-
-#else /* ! MACOSX */
-
 #ifndef _CPPUHELPER_COMPBASE_EX_HXX_
 #include <cppuhelper/compbase_ex.hxx>
 #endif
@@ -180,6 +169,4 @@ namespace cppu
     };
 }
 
-#endif /* MACOSX */
-
 #endif
-- 
cgit