Drop OS2

6 files changed, 7 insertions, 19 deletions

diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index d5940d805097..015d8855caad 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -36,7 +36,7 @@
 #include <tools/geninfo.hxx>
 #include "bootstrp/prj.hxx"
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 #define LIST_DELIMETER ';'
 #define PATH_DELIMETER '\\'
 #elif defined UNX
diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index 91636d8dc718..f3420b8ff50e 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.hxx
@@ -32,8 +32,6 @@
 //============================================================================
 #if defined WNT
 #define TOOLS_INETDEF_OS "Win32"
-#elif defined OS2
-#define TOOLS_INETDEF_OS "OS/2"
 #elif defined UNX
 #if defined AIX
 #define TOOLS_INETDEF_OS "AIX"
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 55e649e42d0a..bb65e70e0c54 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -221,8 +221,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
   #define __DLLEXTENSION "mi"
 #elif defined WNT && defined _MSC_VER && defined X86_64
   #define __DLLEXTENSION "mx"
-#elif defined OS2
-  #define __DLLEXTENSION "go"
 #elif defined AIX
   #define __DLLEXTENSION "ap.so"
 #elif defined SOLARIS && defined SPARC && defined IS_LP64
@@ -310,7 +308,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define LIBRARY_CONCAT4( s1, s2, s3, s4 ) \
     s1 s2 s3 s4
 
-#if defined WNT || defined OS2
+#if defined WNT
 #define SVLIBRARY( Base ) \
     LIBRARY_CONCAT3( Base, __DLLEXTENSION, ".DLL" )
 #define SVLIBRARYLANG( Base, Lang ) \
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index e10e7288d1e8..f77d9630d962 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -133,8 +133,6 @@ enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 }
 
 #ifdef SAL_W32
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(1)
 #endif
 
 typedef struct _ByteStringData
@@ -146,8 +144,6 @@ typedef struct _ByteStringData
 
 #ifdef SAL_W32
 #pragma pack(pop)
-#elif defined(SAL_OS2)
-#pragma pack()
 #endif
 
 // --------------
@@ -421,8 +417,6 @@ inline ByteString ByteString::GetQuotedToken( xub_StrLen nToken, const ByteStrin
 
 #ifdef SAL_W32
 #pragma pack(push, 4)
-#elif defined(SAL_OS2)
-#pragma pack(1)
 #endif
 
 typedef struct _UniStringData
@@ -434,8 +428,6 @@ typedef struct _UniStringData
 
 #ifdef SAL_W32
 #pragma pack(pop)
-#elif defined(SAL_OS2)
-#pragma pack()
 #endif
 
 // -------------
diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk
index d97156c7f66c..129360e70fba 100644
--- a/tools/workben/makefile.mk
+++ b/tools/workben/makefile.mk
@@ -42,7 +42,7 @@ OBJFILES = \
 
 APP1TARGET = solar
 APP1OBJS = $(OBJ)$/solar.obj
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "UNX"
 APP1STDLIBS = $(TOOLSLIB)
 .ELSE
 APP1LIBS = $(LB)$/itools.lib
@@ -50,7 +50,7 @@ APP1LIBS = $(LB)$/itools.lib
 
 APP2TARGET = urltest
 APP2OBJS = $(OBJ)$/urltest.obj
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "UNX"
 APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
 .ELSE
 APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
diff --git a/tools/workben/solar.c b/tools/workben/solar.c
index 283234220245..9ebece78ea12 100644
--- a/tools/workben/solar.c
+++ b/tools/workben/solar.c
@@ -43,7 +43,7 @@ int GetStackAlignment(void);
 void PrintArgs( int p, ... );
 int check( TestFunc func, Type eT, void* p );
 
-#if defined (UNX) || defined (WNT) || defined (OS2)
+#if defined (UNX) || defined (WNT)
 
 #ifdef UNX
 #include <unistd.h>
@@ -123,7 +123,7 @@ int GetStackAlignment()
 
 
 
-#if defined (UNX) || defined (WNT) || defined (OS2)
+#if defined (UNX) || defined (WNT)
 
 #ifdef I_STDARG
 void PrintArgs( int p, ... )
@@ -154,7 +154,7 @@ va_dcl
 #ifndef USE_FORK_TO_CHECK
 static jmp_buf check_env;
 static int bSignal;
-#if defined (UNX) || defined (OS2)
+#if defined (UNX)
 void SignalHandler( int sig )
 #else
 void __cdecl SignalHandler( int sig )