Remove some OS/2 code

7 files changed, 3 insertions, 18 deletions

diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 6360f82320d2..f13a2cfaff79 100755
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -62,11 +62,7 @@ SHL1LIBS=\
     $(SLB)$/regexp.lib
 SHL1IMPLIB=i$(TARGET)
 
-.IF "$(GUI)" == "OS2"
-DEF1EXPORTFILE=exports2.dxp
-.ELSE
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.ENDIF
 
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index 3d97cb23873c..222daf0cdda8 100755
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -69,10 +69,6 @@ SHL1STDLIBS=\
 
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
-.IF "$(GUI)" == "OS2"
-DEF1EXPORTFILE=exports2.dxp
-.ENDIF
-
 DEF1NAME=$(SHL1TARGET)
 .ENDIF # L10N_framework
 
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 6cad3c0fb0eb..d3392ac5ab18 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -514,7 +514,7 @@ void SAL_CALL FileProvider::initProperties( void )
 
 #if defined ( UNX )
         m_FileSystemNotation = FileSystemNotation::UNIX_NOTATION;
-#elif defined( WNT ) || defined( OS2 )
+#elif defined( WNT )
         m_FileSystemNotation = FileSystemNotation::DOS_NOTATION;
 #else
         m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION;
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 38df50b92a77..476248420f22 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -300,7 +300,7 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
             beans::PropertyState_DEFAULT_VALUE,
             beans::PropertyAttribute::MAYBEVOID
             | beans::PropertyAttribute::BOUND
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
         ));
 #else
     | beans::PropertyAttribute::READONLY)); // under unix/linux only readable
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index 6f55fed25fed..9440d0cd6205 100755
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -77,10 +77,6 @@ SHL1STDLIBS=\
     $(UCBHELPERLIB) \
     $(CURLLIB)
 
-.IF "$(GUI)" == "OS2"
-SHL1STDLIBS+=ssl.lib crypto.lib libz.lib
-.ENDIF
-
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS= \
     $(LIB1TARGET)
diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index a8eb6f83a6bc..15b75ec4bd39 100644
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
@@ -44,7 +44,7 @@
 /** our main program to convert ODMAIDs to ODMA URLs
 */
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 void main( int argc, char * argv[] )
 #else
 void _cdecl main( int argc, char * argv[] )
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 162d58266406..339d2b5f01a4 100755
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -135,9 +135,6 @@ SHL1STDLIBS+= $(OPENSSLLIB)
 .IF "$(OS)"=="SOLARIS"
 SHL1STDLIBS+= -lnsl -lsocket -ldl
 .ENDIF # SOLARIS
-.IF "$(OS)"=="OS2"
-SHL1STDLIBS+= pthread.lib libz.lib
-.ENDIF # OS2
 .IF "$(SYSTEM_OPENSSL)"=="YES"
 SHL1STDLIBS+= $(OPENSSLLIB)
 .ELSE