diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-16 09:08:29 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-04-18 16:59:48 +0200 |
| commit | 35e1b53c7e6176315257cae9434ec4364262282c (patch) | |
| tree | 32c349e5d26d2e4475af8ae260bdc29ca4dd17f3 /cppu/source | |
| parent | be6061a954b5f55b20d0e58aa12b425b6505f56e (diff) | |
Remove OS/2 support.
Diffstat (limited to 'cppu/source')
| -rw-r--r-- | cppu/source/helper/purpenv/export.mk | 4 | ||||
| -rw-r--r-- | cppu/source/typelib/static_types.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/data.cxx | 6 |
4 files changed, 1 insertions, 17 deletions
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk index 7e5e9d04d1d2..004787e4f45c 100644 --- a/cppu/source/helper/purpenv/export.mk +++ b/cppu/source/helper/purpenv/export.mk @@ -4,10 +4,6 @@ NAMEpurpenv_helper := uno_purpenvhelper$(COMID) purpenv_helper_LIB := -l$(NAMEpurpenv_helper) -.ELIF "$(GUI)"=="OS2" -NAMEpurpenv_helper := purpeh$(UDK_MAJOR) -purpenv_helper_LIB := i$(NAMEpurpenv_helper) - .ELSE NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID) .IF "$(COM)"=="GCC" diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 4af4fb1251c8..bc2f67c2fefb 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -70,8 +70,6 @@ void SAL_CALL typelib_typedescriptionreference_getByName( #ifdef SAL_W32 #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(8) #endif /** @@ -95,8 +93,6 @@ struct AlignSize_Impl #ifdef SAL_W32 #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif // the value of the maximal alignment diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 8b69ccb1aa4b..672502cec457 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -62,8 +62,6 @@ using ::rtl::OString; #ifdef SAL_W32 #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(8) #endif /** @@ -87,8 +85,6 @@ struct AlignSize_Impl #ifdef SAL_W32 #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif // the value of the maximal alignment diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index f9b1903851c4..19da7a87fbc1 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -356,12 +356,10 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 4) #endif #if defined(INTEL) \ - && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) \ + && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) || defined(DRAGONFLY) \ || defined(__SUNPRO_CC) && defined(SOLARIS)) #define MAX_ALIGNMENT_4 @@ -597,8 +595,6 @@ BinaryCompatible_Impl::BinaryCompatible_Impl() #ifdef SAL_W32 # pragma pack(pop) -#elif defined(SAL_OS2) -# pragma pack() #endif static BinaryCompatible_Impl aTest; |