mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED

Browse Source 
2004/01/29 15:09:17 hr 1.8.40.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien
2004-02-02 22:10:04 +00:00
parent 29fd5effff
commit 7317533a4b
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cppuhelper/inc/cppuhelper/compbase7.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: compbase7.hxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -65,17 +65,6 @@
#include <cppuhelper/implbase7.hxx> #include <cppuhelper/implbase7.hxx>
#endif #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_ #ifndef _CPPUHELPER_COMPBASE_EX_HXX_
#include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/compbase_ex.hxx>
#endif #endif
@@ -180,6 +169,4 @@ namespace cppu
}; };
} }
#endif /* MACOSX */
#endif #endif