diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:18:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:18:17 +0000 |
| commit | c2570ab51d776c79899ab7a876537328888771f8 (patch) | |
| tree | 4ee33309f5adeb7f8c2c144be6ae4b5684af17be /cppu | |
| parent | 868015ed9869af05573132361f4f9f4448af762e (diff) | |
INTEGRATION: CWS geordi2q14 (1.17.10); FILE MERGED
2004/01/29 15:06:49 hr 1.17.10.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/inc/com/sun/star/uno/Sequence.hxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index 26d02a07ebdb..4c8b7d108653 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Sequence.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: vg $ $Date: 2004-01-06 19:06:32 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:18:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -300,20 +300,16 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType ) & ::com::sun::star::uno::Sequence< E >::s_pType ); } -#if ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || \ - (defined(__GNUC__) && defined(__APPLE__))) -static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char -= 0; +#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) +static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; #endif // char sequence inline const ::com::sun::star::uno::Type & SAL_CALL getCharSequenceCppuType() SAL_THROW( () ) { -#if !( (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || \ - (defined(__GNUC__) && defined(__APPLE__)) ) - static typelib_TypeDescriptionReference * - s_pType_com_sun_star_uno_Sequence_Char = 0; +#if !( defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) + static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; #endif if (! s_pType_com_sun_star_uno_Sequence_Char) { |