diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:06:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:06:08 +0000 |
| commit | 7aa0dcf0ac2fb4925923c8badd4200cc000431ed (patch) | |
| tree | b29ce55c3ee9ed691697a8486cf9ed0172e330c7 /sal/inc | |
| parent | 9d91afe8893c278b635edc7cacea0c298af97b90 (diff) | |
INTEGRATION: CWS os2port01 (1.18.174); FILE MERGED
2007/08/09 08:51:43 obr 1.18.174.2: RESYNC: (1.18-1.19); FILE MERGED
2006/11/29 14:26:29 ydario 1.18.174.1: Initial OS/2 import.
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/osl/process.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h index 6663620e49e3..3acc66149381 100644 --- a/sal/inc/osl/process.h +++ b/sal/inc/osl/process.h @@ -4,9 +4,9 @@ * * $RCSfile: process.h,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2007-05-09 13:21:37 $ + * last change: $Author: vg $ $Date: 2007-09-20 15:06:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,7 +117,7 @@ typedef sal_Int32 oslDescriptorFlag; #ifdef SAL_W32 # pragma pack(push, 8) #elif defined(SAL_OS2) -# pragma pack(1) +# pragma pack(push, 4) #endif typedef struct { @@ -130,10 +130,8 @@ typedef struct { sal_uInt32 HeapUsage; } oslProcessInfo; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) # pragma pack(pop) -#elif defined(SAL_OS2) -# pragma pack() #endif /** Process handle |