diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:43:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:43:27 +0000 |
| commit | 9f13c3c808e5c6df15ad85bfbb4b805799145bc1 (patch) | |
| tree | 127c72ef66b8dc632cf565ec3619f3cfa344f66b /cppu/inc | |
| parent | b55d18416e37632cc3698525ec88d50b7e550b9f (diff) | |
INTEGRATION: CWS os2port01 (1.10.80); FILE MERGED
2006/12/28 14:53:43 ydario 1.10.80.1: OS/2 initial import.
Diffstat (limited to 'cppu/inc')
| -rw-r--r-- | cppu/inc/uno/any2.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h index bb139a6bcf51..0fde34e74a40 100644 --- a/cppu/inc/uno/any2.h +++ b/cppu/inc/uno/any2.h @@ -4,9 +4,9 @@ * * $RCSfile: any2.h,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:38:13 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:43:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,10 +47,10 @@ extern "C" { #endif -#ifdef SAL_W32 +#if defined( SAL_W32) #pragma pack(push, 8) #elif defined(SAL_OS2) -#pragma pack(8) +#pragma pack(push, 8) #endif struct _typelib_TypeDescriptionReference; @@ -74,10 +74,8 @@ typedef struct _uno_Any void * pReserved; } uno_Any; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif /** Assign an any with a given value. Interfaces are acquired or released by the given callback |