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 /cppuhelper | |
parent | be6061a954b5f55b20d0e58aa12b425b6505f56e (diff) |
Remove OS/2 support.
Diffstat (limited to 'cppuhelper')
-rwxr-xr-x | cppuhelper/source/makefile.mk | 7 | ||||
-rw-r--r-- | cppuhelper/source/propshlp.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/test/cfg_test.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/test/makefile.mk | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index cd742b9a0856..a7fd2241344a 100755 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -37,7 +37,7 @@ USE_DEFFILE=TRUE # without "-L" (light) switch BOOTSTRAP_SERVICE=TRUE -.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" +.IF "$(OS)" != "WNT" UNIXVERSIONNAMES=UDK .ENDIF # WNT @@ -149,9 +149,6 @@ OBJFILES = $(OBJ)$/findsofficepath.obj .IF "$(GUI)" == "WNT" SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) -.ELIF "$(GUI)" == "OS2" -SHL1TARGET=cppuh -SHL1TARGET=cppuh$(UDK_MAJOR) .ELSE SHL1TARGET=uno_$(TARGET)$(COMID) .ENDIF @@ -179,8 +176,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map SHL1VERSIONMAP=msvc_win32_x86_64.map .ELIF "$(COMNAME)"=="sunpro5" SHL1VERSIONMAP=cc5_solaris_sparc.map -.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3" -SHL1VERSIONMAP=gcc3os2.map .ELIF "$(COMNAME)"=="gcc3" SHL1VERSIONMAP=gcc3.map .ENDIF diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 332439130c84..27d18ad26075 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -1107,11 +1107,9 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () ) { if( pProperties[i-1].Name >= pProperties[i].Name ) { -#ifndef OS2 // YD disabled, too many troubles with debug builds! if (bSorted) { OSL_FAIL( "Property array is not sorted" ); } -#endif // not sorted qsort( aInfos.getArray(), nElements, sizeof( Property ), compare_Property_Impl ); diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index dfee341e5109..5b46011509ad 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -273,7 +273,7 @@ SAL_IMPLEMENT_MAIN() OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x ); ::fprintf( stderr, "> registering service...\n"); -#if defined(SAL_W32) || defined(SAL_OS2) +#if defined(SAL_W32) OUString libName( OUSTR("cfg_test.dll") ); #elif defined(SAL_UNX) OUString libName( OUSTR("libcfg_test.so") ); diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk index 2746b3f07c1c..7a67d6690c8b 100644 --- a/cppuhelper/test/makefile.mk +++ b/cppuhelper/test/makefile.mk @@ -127,7 +127,7 @@ TYPES:=test.A;test.BA;test.CA;test.DBA;test.E;test.FE;test.G;test.H;test.I HELPERTYPES:=com.sun.star.uno.XReference;com.sun.star.uno.XAdapter;com.sun.star.uno.XAggregation;com.sun.star.uno.XWeak;com.sun.star.lang.XComponent;com.sun.star.lang.XTypeProvider;com.sun.star.lang.XEventListener;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.registry.XRegistryKey;com.sun.star.lang.XInitialization;com.sun.star.lang.XServiceInfo;com.sun.star.loader.XImplementationLoader;com.sun.star.lang.IllegalAccessException;com.sun.star.beans.XVetoableChangeListener;com.sun.star.beans.XPropertySet;com.sun.star.uno.XComponentContext FACTORYTYPES:=com.sun.star.lang.XComponent;com.sun.star.registry.XSimpleRegistry;com.sun.star.lang.XInitialization;com.sun.star.lang.XMultiServiceFactory;com.sun.star.loader.XImplementationLoader;com.sun.star.registry.XImplementationRegistration;com.sun.star.container.XSet;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XMultiComponentFactory -.IF "$(OS)" == "WNT" || "$(OS)" == "OS2" +.IF "$(OS)" == "WNT" UNO_PATH := $(SOLARBINDIR) UNO_OUT := $(OUT)$/bin EXT_SO := .dll |