diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:06:50 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:06:50 +0000 |
| commit | 0b7cb0629bd4ca1724b694f4555a0c9665ecb1d8 (patch) | |
| tree | 0f7406a5c7593626d5f9b11a6dacc8389793fd67 /sal/inc/rtl/locale.h | |
| parent | 36dd7e9d4f7adbb1cd733551abd01a88f40374c9 (diff) | |
INTEGRATION: CWS os2port01 (1.4.174); FILE MERGED
2006/11/29 14:26:29 ydario 1.4.174.1: Initial OS/2 import.
Diffstat (limited to 'sal/inc/rtl/locale.h')
| -rw-r--r-- | sal/inc/rtl/locale.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h index fed40633a136..72acd0a3d563 100644 --- a/sal/inc/rtl/locale.h +++ b/sal/inc/rtl/locale.h @@ -4,9 +4,9 @@ * * $RCSfile: locale.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:38:05 $ + * last change: $Author: vg $ $Date: 2007-09-20 15:06:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,9 +45,9 @@ extern "C" { #endif #ifdef SAL_W32 -#pragma pack(push, 8) +# pragma pack(push, 8) #elif defined(SAL_OS2) -#pragma pack(1) +# pragma pack(push, 4) #endif /** @@ -76,10 +76,8 @@ typedef struct _rtl_Locale sal_Int32 HashCode; } rtl_Locale; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif /** |