Remove OS/2 support.

7 files changed, 5 insertions, 9 deletions

diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index d9ff9ec02..008999284 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -59,7 +59,7 @@
 
 #include "mergekeys.hxx"
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #endif 
 
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index ba170a1fe..93d31c2aa 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -32,9 +32,7 @@
 #include <string.h>
 
 // Schalter fuer Introspection-Caching
-#ifndef OS2
 #define USE_INTROSPECTION_CACHE
-#endif
 
 #ifdef USE_INTROSPECTION_CACHE
 #define INTROSPECTION_CACHE_MAX_SIZE 100
diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx
index 12706dd28..e184b9a94 100644
--- a/stoc/test/excomp/excomp.cxx
+++ b/stoc/test/excomp/excomp.cxx
@@ -67,7 +67,7 @@ OUString getExePath()
 
     OSL_VERIFY(osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 10);
 #else
     exe = exe.copy(0, exe.getLength() - 6);
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk
index 2f24634da..d4be0a9ec 100644
--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -98,7 +98,7 @@ APP3STDLIBS= \
 .IF "$(GUI)"=="UNX"
 APP3STDLIBS+= -l$(SHL1TARGET)
 .ENDIF
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 APP3STDLIBS+= i$(SHL1TARGET).lib
 .ENDIF
 
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index aee32df6a..b59030161 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -525,10 +525,8 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100000000"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
-#ifndef OS2
     aVal <<= (double)( SAL_CONST_INT64(0x100000000) );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
-#endif
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= (double)( 5 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index bb74c4a21..5db6c0301 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -113,7 +113,7 @@ OUString getExePath()
 {
 OUString 		exe;
 OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
 exe = exe.copy(0, exe.getLength() - 16);
 #else
 exe = exe.copy(0, exe.getLength() - 12);
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index f168e56db..d22f59fce 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -65,7 +65,7 @@ OUString getExePath()
 
     OSL_VERIFY( osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 16);
 #else
     exe = exe.copy(0, exe.getLength() - 12);