diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:07:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:07:04 +0000 |
| commit | 151492a21e39924e9de32c486f56af915d6e988e (patch) | |
| tree | 627cad909b15a5de9e2aebdb2ef95292c96b0b6f /sal/inc | |
| parent | 0b7cb0629bd4ca1724b694f4555a0c9665ecb1d8 (diff) | |
INTEGRATION: CWS os2port01 (1.14.64); FILE MERGED
2007/08/09 08:52:27 obr 1.14.64.2: RESYNC: (1.14-1.15); FILE MERGED
2006/11/29 14:26:30 ydario 1.14.64.1: Initial OS/2 import.
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/rtl/string.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h index 0899194bb6e9..06b40eaf6e55 100644 --- a/sal/inc/rtl/string.h +++ b/sal/inc/rtl/string.h @@ -4,9 +4,9 @@ * * $RCSfile: string.h,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2007-04-03 14:03:40 $ + * last change: $Author: vg $ $Date: 2007-09-20 15:07:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -754,9 +754,9 @@ double SAL_CALL rtl_str_toDouble( const sal_Char * str ) SAL_THROW_EXTERN_C(); /* ======================================================================= */ #ifdef SAL_W32 -#pragma pack(push, 8) +# pragma pack(push, 8) #elif defined(SAL_OS2) -#pragma pack(1) +# pragma pack(push, 4) #endif /** The implementation of a byte string. @@ -770,10 +770,8 @@ typedef struct _rtl_String sal_Char buffer[1]; } rtl_String; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif /* ----------------------------------------------------------------------- */ |