diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:43:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:43:01 +0000 |
| commit | b55d18416e37632cc3698525ec88d50b7e550b9f (patch) | |
| tree | 016c495fbc9130c2467ec7b5f5e14cf40b30d146 /cppu/inc | |
| parent | 9063598cfdb46215692f221d04e402eb40ef8151 (diff) | |
INTEGRATION: CWS os2port01 (1.20.80); FILE MERGED
2006/12/28 14:53:42 ydario 1.20.80.1: OS/2 initial import.
Diffstat (limited to 'cppu/inc')
| -rw-r--r-- | cppu/inc/typelib/typedescription.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index a4574e677939..8746d588ab4f 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -4,9 +4,9 @@ * * $RCSfile: typedescription.h,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:37:08 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:43:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,10 +55,10 @@ extern "C" struct _typelib_TypeDescription; -#ifdef SAL_W32 +#if defined( SAL_W32) #pragma pack(push, 8) #elif defined(SAL_OS2) -#pragma pack(8) +#pragma pack(push, 8) #endif /** Holds a weak reference to a type description. @@ -575,10 +575,8 @@ typedef struct _typelib_Union_Init typelib_TypeDescriptionReference* pTypeRef; } typelib_Union_Init; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif |