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 | |
parent | be6061a954b5f55b20d0e58aa12b425b6505f56e (diff) |
Remove OS/2 support.
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/inc/typelib/typedescription.h | 4 | ||||
-rw-r--r-- | cppu/inc/typelib/uik.h | 4 | ||||
-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 | ||||
-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 | ||||
-rw-r--r-- | cppu/util/extra.mk | 18 | ||||
-rw-r--r-- | cppu/util/makefile.mk | 4 | ||||
-rw-r--r-- | cppu/util/makefile.pmk | 4 |
13 files changed, 8 insertions, 60 deletions
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index 2758d0914ca9..a88894c723a7 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -42,8 +42,6 @@ struct _typelib_TypeDescription; #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** Holds a weak reference to a type description. @@ -560,7 +558,7 @@ typedef struct _typelib_Union_Init typelib_TypeDescriptionReference* pTypeRef; } typelib_Union_Init; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h index 026d376da9f2..f201407d7aa0 100644 --- a/cppu/inc/typelib/uik.h +++ b/cppu/inc/typelib/uik.h @@ -32,8 +32,6 @@ #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** Binary typelib uik struct. Internally not used anymore. @@ -47,7 +45,7 @@ typedef struct _typelib_Uik sal_uInt32 m_Data5; } typelib_Uik; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) # pragma pack(pop) #endif 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 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; diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index f013516480fc..8c6d6944e0ad 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -44,13 +44,7 @@ SHL3TARGET := unsafe_uno_uno SHL3IMPLIB := i$(SHL3TARGET) SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL3OBJS := $(SLO)$/UnsafeBridge.obj -.IF "$(GUI)"=="OS2" -SHL3VERSIONMAP=unsafe_os2.map -SHL3DEF=$(MISC)$/$(SHL3TARGET).def -DEF3NAME=$(SHL3TARGET) -.ELSE SHL3DEF := empty.def -.ENDIF SHL3OBJS := $(SLO)$/UnsafeBridge.obj SHL3RPATH := URELIB @@ -58,13 +52,7 @@ SHL4TARGET := affine_uno_uno SHL4IMPLIB := i$(SHL4TARGET) SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL4OBJS := $(SLO)$/AffineBridge.obj -.IF "$(GUI)"=="OS2" -SHL4VERSIONMAP=unsafe_os2.map -SHL4DEF=$(MISC)$/$(SHL4TARGET).def -DEF4NAME=$(SHL4TARGET) -.ELSE SHL4DEF := empty.def -.ENDIF SHL4OBJS := $(SLO)$/AffineBridge.obj SHL4RPATH := URELIB @@ -74,13 +62,7 @@ SHL5IMPLIB := i$(SHL5TARGET) SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB) SHL5OBJS := $(SLO)$/LogBridge.obj -.IF "$(GUI)"=="OS2" -SHL5VERSIONMAP=unsafe_os2.map -SHL5DEF=$(MISC)$/$(SHL5TARGET).def -DEF5NAME=LogMapping.def -.ELSE SHL5DEF := empty.def -.ENDIF SHL5RPATH := URELIB # --- Targets ------------------------------------------------------ diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 8d1003bd4de6..0235f9aed13d 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -50,7 +50,7 @@ SHL1LIBS= \ $(SLB)$/cppu_threadpool.lib \ $(SLB)$/cppu_cppu.lib -.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)" == "WNT" SHL1TARGET=$(TARGET)$(UDK_MAJOR) .ELSE SHL1TARGET= uno_$(TARGET) @@ -74,8 +74,6 @@ SHL2TARGET := $(NAMEpurpenv_helper) DEF2NAME := $(SHL2TARGET) .IF "$(GUI)$(COM)"=="WNTGCC" SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map -.ELIF "$(GUI)"=="OS2" -SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map .ELIF "$(COMNAME)"=="mscx" SHL2VERSIONMAP:=$(SHL2TARGET)X.map .ELSE diff --git a/cppu/util/makefile.pmk b/cppu/util/makefile.pmk index c1259ddf4a10..95e83db6dc07 100644 --- a/cppu/util/makefile.pmk +++ b/cppu/util/makefile.pmk @@ -26,7 +26,3 @@ #************************************************************************* ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE - -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF |