Drop OS2

9 files changed, 3 insertions, 46 deletions

diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 90237153de77..3e67ada06bd4 100755
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -68,7 +68,7 @@ SHL1STDLIBS=\
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX"
 SHL1STDLIBS+=$(UCBHELPERLIB)
 .ENDIF
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 5cc807fceb11..e7fe48f05b18 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -44,12 +44,6 @@
 #include <vector>
 #include <map>
 
-#ifdef XP_OS2
-#define INCL_DOSERRORS
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#endif
-
 using namespace com::sun::star::mozilla;
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 6e52c40b8f71..eed61b61d26d 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
@@ -42,12 +42,6 @@
 #include <vector>
 #include <map>
 
-#ifdef XP_OS2
-#define INCL_DOSERRORS
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#endif
-
 using namespace com::sun::star::mozilla;
 class nsProfile;
 namespace connectivity
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index b44436e488ce..c4c1d2110619 100755
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -31,11 +31,6 @@ PRJINC=..$/..$/..
 PRJNAME=connectivity
 TARGET=mozbootstrap
 
-.IF "$(OS)" == "OS2"
-all: 
-    @echo "    Not building under OS/2"
-.ENDIF
-
 # --- Settings ----------------------------------
 
 USE_DEFFILE=TRUE
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 1928961b04b7..cefb6f9fb969 100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -31,7 +31,7 @@ TARGET=mozab
 TARGET2=$(TARGET)drv
 VISIBILITY_HIDDEN=TRUE
 
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" )
+.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" )
 all: 
     @echo "    Not building the mozilla address book driver"
     @echo "    dependency to Mozilla developer snapshots not feasable at the moment"
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index 49c0bd8033a6..810be9bcb457 100755
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -44,7 +44,7 @@ VISIBILITY_HIDDEN=TRUE
 
 .INCLUDE : settings.mk
 
-.IF  ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2"
+.IF  ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
 dummy:
     @echo "		Not building the mozillasrc stuff in LibreOffice build"
     @echo "		dependency to Mozilla developer snapshots not feasable at the moment"
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 602ce5e935c9..9cc27a25d906 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -123,24 +123,11 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
         _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodbc.so"));
  #endif   /* MACOSX */
 #endif
-#ifdef OS2
-    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC"));
-#endif
 
     if ( !pODBCso )
         pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
     if( !pODBCso)
-#ifdef OS2
-    {
-        delete pODBCso;
-        _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WOD402"));
-        pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
-        if( !pODBCso)
-            return sal_False;
-    }
-#else
         return sal_False;
-#endif
 
     return bLoaded = LoadFunctions(pODBCso);
 }
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 1fb37bd2cc23..01786287ee02 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -42,11 +42,6 @@
 
 #ifdef HAVE_64BIT_POINTERS
 #error "no 64 bit pointer"
-#else
-#ifdef OS2
-#define PVOID_TO_INT64(x) (jlong)(sal_Int32)x
-#define INT64_TO_PVOID(x) (void *)x
-#endif // OS2
 #endif //HAVE_64BIT_POINTERS
 
 namespace comphelper
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index bd53c4b55308..a53f07209349 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -61,14 +61,6 @@
 
 //--------------------------------------------------------------------------
 
-#ifdef OS2
-#define ALLREADY_HAVE_OS2_TYPES
-#define DONT_TD_VOID
-#include <svpm.h>
-#include <odbc/sqlext.h>
-#define SDB_ODBC_CHAR UCHAR
-#endif // OS2
-
 #ifdef OS2__00
 
 #ifdef ODBCIMP