Drop OS2

4 files changed, 4 insertions, 16 deletions

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index c7b5b4ffed2d..89034c31d4a2 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -54,7 +54,7 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
 #ifdef WNT
 #define CDECL _cdecl
 #endif
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #define CDECL
 #endif
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 7e7304b6ce76..05a966b0c38b 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -69,7 +69,7 @@ using namespace com::sun::star;
 #ifdef WNT
 #define CDECL _cdecl
 #endif
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #define CDECL
 #endif
 #ifdef UNX
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 4c450837038d..6da98356cf7e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -98,7 +98,7 @@ using namespace com::sun::star::script;
 
 SbxVariable* getDefaultProp( SbxVariable* pRef );
 
-#if defined (WNT) || defined (OS2)
+#if defined (WNT)
 #include <direct.h>   // _getdcwd get current work directory, _chdrive
 #endif
 
@@ -415,7 +415,7 @@ RTLFUNC(CurDir)
     // DirEntry-Funktionalitaet keine Moeglichkeit besteht, das aktuelle so
     // zu ermitteln, dass eine virtuelle URL geliefert werden koennte.
 
-#if defined (WNT) || defined (OS2)
+#if defined (WNT)
     int nCurDir = 0;  // Current dir // JSM
     if ( rPar.Count() == 2 )
     {
@@ -438,10 +438,6 @@ RTLFUNC(CurDir)
         }
     }
     char* pBuffer = new char[ _MAX_PATH ];
-#ifdef OS2
-    if( !nCurDir )
-        nCurDir = _getdrive();
-#endif
     if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 )
         rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) );
     else
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index c12924770fa1..4bdbe9e7fd81 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -41,12 +41,6 @@
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 
-#ifdef OS2
-#define INCL_DOS
-#define INCL_DOSPROCESS
-#include <svpm.h>
-#endif
-
 #ifndef CLK_TCK
 #define CLK_TCK CLOCKS_PER_SEC
 #endif
@@ -509,8 +503,6 @@ RTLFUNC(GetGUIType)
         // 17.7.2000 Make simple solution for testtool / fat office
 #if defined (WNT)
         rPar.Get(0)->PutInteger( 1 );
-#elif defined OS2
-        rPar.Get(0)->PutInteger( 2 );
 #elif defined UNX
         rPar.Get(0)->PutInteger( 4 );
 #else