diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:43:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:43:41 +0000 |
| commit | e0c4d7727ceaedfd7eba2260f45da8abaa2b123a (patch) | |
| tree | 21006bc1422280af6b5e3f0faf1a37ee040d4b27 /cppu/inc | |
| parent | 9f13c3c808e5c6df15ad85bfbb4b805799145bc1 (diff) | |
INTEGRATION: CWS os2port01 (1.5.80); FILE MERGED
2006/12/28 14:53:43 ydario 1.5.80.1: OS/2 initial import.
Diffstat (limited to 'cppu/inc')
| -rw-r--r-- | cppu/inc/typelib/uik.h | 14 | ||||
| -rw-r--r-- | cppu/inc/uno/dispatcher.h | 12 |
2 files changed, 11 insertions, 15 deletions
diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h index 773d386360ca..e8ea9bb27662 100644 --- a/cppu/inc/typelib/uik.h +++ b/cppu/inc/typelib/uik.h @@ -4,9 +4,9 @@ * * $RCSfile: uik.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:37:54 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:43:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,10 +39,10 @@ #include <sal/types.h> #endif -#ifdef SAL_W32 -# pragma pack(push, 8) +#if defined( SAL_W32) +#pragma pack(push, 8) #elif defined(SAL_OS2) -# pragma pack(8) +#pragma pack(push, 8) #endif /** Binary typelib uik struct. Internally not used anymore. @@ -56,10 +56,8 @@ typedef struct _typelib_Uik sal_uInt32 m_Data5; } typelib_Uik; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) # pragma pack(pop) -#elif defined(SAL_OS2) -# pragma pack() #endif #endif diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h index 1d377f91f71d..0246ff5a9607 100644 --- a/cppu/inc/uno/dispatcher.h +++ b/cppu/inc/uno/dispatcher.h @@ -4,9 +4,9 @@ * * $RCSfile: dispatcher.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:39:44 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:43:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,10 +76,10 @@ typedef void (SAL_CALL * uno_DispatchMethod)( void * pArgs[], uno_Any ** ppException ); -#ifdef SAL_W32 +#if defined( SAL_W32) #pragma pack(push, 8) #elif defined(SAL_OS2) -#pragma pack(8) +#pragma pack(push, 8) #endif /** The binary C uno interface description. @@ -101,10 +101,8 @@ typedef struct _uno_Interface uno_DispatchMethod pDispatcher; } uno_Interface; -#ifdef SAL_W32 +#if defined( SAL_W32) || defined(SAL_OS2) #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif #ifdef __cplusplus |