diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:07:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:07:19 +0000 |
| commit | 094863dfafd0bd735127db2b690fa37d4723bbbf (patch) | |
| tree | 30b11a854b2aaf3571b72d2f5efb478db01fab9d /sal/inc/rtl/ustring.h | |
| parent | 151492a21e39924e9de32c486f56af915d6e988e (diff) | |
INTEGRATION: CWS os2port01 (1.17.64); FILE MERGED
2007/09/05 08:36:48 obr 1.17.64.3: RESYNC: (1.19-1.20); FILE MERGED
2007/08/09 08:53:05 obr 1.17.64.2: RESYNC: (1.17-1.19); FILE MERGED
2006/11/29 14:26:30 ydario 1.17.64.1: Initial OS/2 import.
Diffstat (limited to 'sal/inc/rtl/ustring.h')
| -rw-r--r-- | sal/inc/rtl/ustring.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index 6beb59de2d49..30da6b633e8a 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -4,9 +4,9 @@ * * $RCSfile: ustring.h,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2007-07-26 09:05:28 $ + * last change: $Author: vg $ $Date: 2007-09-20 15:07:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1077,10 +1077,8 @@ double SAL_CALL rtl_ustr_toDouble( const sal_Unicode * str ) SAL_THROW_EXTERN_C( /* ======================================================================= */ -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(push, 4) -#elif defined(SAL_OS2) -#pragma pack(1) #endif /** The implementation of a Unicode string. @@ -1094,10 +1092,8 @@ typedef struct _rtl_uString sal_Unicode buffer[1]; } rtl_uString; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif /* ----------------------------------------------------------------------- */ |