diff options
Diffstat (limited to 'cppu/inc/uno')
-rw-r--r-- | cppu/inc/uno/any2.h | 4 | ||||
-rw-r--r-- | cppu/inc/uno/dispatcher.h | 4 | ||||
-rw-r--r-- | cppu/inc/uno/environment.h | 4 | ||||
-rw-r--r-- | cppu/inc/uno/mapping.h | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h index b359339b4686..dbf64181002e 100644 --- a/cppu/inc/uno/any2.h +++ b/cppu/inc/uno/any2.h @@ -38,8 +38,6 @@ extern "C" #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif struct _typelib_TypeDescriptionReference; @@ -63,7 +61,7 @@ typedef struct _uno_Any void * pReserved; } uno_Any; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h index 74b73d3f2127..297dece16003 100644 --- a/cppu/inc/uno/dispatcher.h +++ b/cppu/inc/uno/dispatcher.h @@ -64,8 +64,6 @@ typedef void (SAL_CALL * uno_DispatchMethod)( #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** The binary C uno interface description. @@ -87,7 +85,7 @@ typedef struct _uno_Interface uno_DispatchMethod pDispatcher; } uno_Interface; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h index 4a02c46abc28..81c0b179ea7b 100644 --- a/cppu/inc/uno/environment.h +++ b/cppu/inc/uno/environment.h @@ -43,8 +43,6 @@ struct _typelib_InterfaceTypeDescription; #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** The binary specification of an UNO environment. @@ -256,7 +254,7 @@ typedef struct _uno_ExtEnvironment } uno_ExtEnvironment; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h index 082b59907ad4..53ea250dd31d 100644 --- a/cppu/inc/uno/mapping.h +++ b/cppu/inc/uno/mapping.h @@ -66,8 +66,6 @@ typedef void (SAL_CALL * uno_MapInterfaceFunc)( #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** This is the binary specification of a mapping. @@ -87,7 +85,7 @@ typedef struct _uno_Mapping uno_MapInterfaceFunc mapInterface; } uno_Mapping; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif |