INTEGRATION: CWS ooo11rc2 (1.7.16); FILE MERGED

2003/07/14 15:18:46 fa 1.7.16.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16611

Dan
fa@ooo
This commit is contained in:
Jens-Heiner Rechtien
2003-07-16 16:49:14 +00:00
parent dfab298b5a
commit 091ccabfa7
3 changed files with 12 additions and 9 deletions

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: compbase5.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
* last change: $Author: hr $ $Date: 2003-07-16 17:48:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,7 +65,8 @@
#include <cppuhelper/implbase5.hxx>
#endif
#ifdef MACOSX /* use old impl helpers for macosx */
#if defined( MACOSX ) && ( __GNUC__ < 3 )
/* use old impl helpers for macosx */
#ifndef _CPPUHELPER_COMPBASE_HXX_
#include <cppuhelper/compbase.hxx>

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: compbase6.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
* last change: $Author: hr $ $Date: 2003-07-16 17:49:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,7 +65,8 @@
#include <cppuhelper/implbase6.hxx>
#endif
#ifdef MACOSX /* use old impl helpers for macosx */
#if defined( MACOSX ) && ( __GNUC__ < 3 )
/* use old impl helpers for macosx */
#ifndef _CPPUHELPER_COMPBASE_HXX_
#include <cppuhelper/compbase.hxx>

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: compbase7.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
* last change: $Author: hr $ $Date: 2003-07-16 17:49:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,7 +65,8 @@
#include <cppuhelper/implbase7.hxx>
#endif
#ifdef MACOSX /* use old impl helpers for macosx */
#if defined( MACOSX ) && ( __GNUC__ < 3 )
/* use old impl helpers for macosx */
#ifndef _CPPUHELPER_COMPBASE_HXX_
#include <cppuhelper/compbase.hxx>