Remove OS/2 support.

11 files changed, 14 insertions, 18 deletions

diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index cfb867f1eb88..0bd28d0a2fb8 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -35,7 +35,7 @@
 #include    <string.h>
 #include    <stdio.h>
 
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #include    <unistd.h>
 #endif
 #ifdef __MINGW32__
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 042e8ec17c44..d61fa32a4b5e 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -37,7 +37,7 @@
 #include "regimpl.hxx"
 #include "regkey.hxx"
 
-#if defined(WIN32) || defined(WNT) || defined(OS2)
+#if defined(WIN32) || defined(WNT)
 #include <io.h>
 #endif
 
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index 502be9638c44..04152c59279b 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -231,7 +231,7 @@ static sal_Bool checkSingletons(Options_Impl const & options, RegistryKey& singl
     return bRet;
 }
 
-#if (defined UNX) || (defined OS2) || (defined __MINGW32__)
+#if (defined UNX) (defined __MINGW32__)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -344,4 +344,4 @@ int _cdecl main( int argc, char * argv[] )
     }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx
index f85e3cddb8f4..370c82bea4d3 100644
--- a/registry/tools/rdbedit.cxx
+++ b/registry/tools/rdbedit.cxx
@@ -262,7 +262,7 @@ OString Options::prepareVersion()
 static Options options;
 
 
-#if (defined UNX) || (defined OS2) || (defined __MINGW32__)
+#if (defined UNX) || (defined __MINGW32__)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 7758c4a74066..44f725ce0d49 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -1962,7 +1962,7 @@ static sal_uInt32 compareKeys(
     return nError;
 }
 
-#if (defined UNX) || (defined OS2) || defined __MINGW32__
+#if (defined UNX) || defined __MINGW32__
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -2090,4 +2090,4 @@ int _cdecl main( int argc, char * argv[] )
     return ((nError > 0) ? 11 : 0);
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 9e25bc56f396..193209be2733 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -92,7 +92,7 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string > & rArgs)
     return true;
 }
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -179,4 +179,4 @@ int _cdecl main( int argc, char * argv[] )
     return(0);
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 482d62b44f9b..2cb11b815c86 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -40,7 +40,7 @@
 using rtl::OUString;
 using namespace registry::tools;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk
index 2813d696516a..b7b8037f64b4 100644
--- a/registry/workben/makefile.mk
+++ b/registry/workben/makefile.mk
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS := TRUE
 CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
 
 RGTLIB = rgt.lib
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="UNX"
 RGTLIB = -lrgt$(DLLPOSTFIX)
 .ENDIF
 
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index 584fac277d85..83b5db8dd2e4 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -67,11 +67,7 @@ public:
     };
 
 protected:
-#ifdef OS2
-    struct timeb m_start, m_stop;
-#else
     struct _timeb m_start, m_stop;
-#endif
     double m_diff;
 };
 #else
@@ -106,7 +102,7 @@ protected:
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index fb45c62e2a20..ef9c106fd0cc 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -41,7 +41,7 @@ using namespace std;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main()
 #else
 int _cdecl main()
diff --git a/registry/workben/test.cxx b/registry/workben/test.cxx
index d869cda1aab4..4f225722b7ca 100644
--- a/registry/workben/test.cxx
+++ b/registry/workben/test.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main()
 #else
 int _cdecl main()