[Libreoffice-commits] .: soltools/mkdepend soltools/testSHL stlport/makefile.mk

[François Tigeot]

 soltools/mkdepend/main.c     |    8 ++++----
 soltools/testSHL/testshl.cxx |    2 +-
 stlport/makefile.mk          |    7 -------
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 713c1a06272e1bb70f7c7f26214ee21cfcbfba23
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sun Jun 12 07:17:09 2011 +0200

    Remove some OS/2 remnants

diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index f4ad218..9798c3f 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -148,7 +148,7 @@ catch (sig)
     fatalerr ("got signal %d\n", sig);
 }
 
-#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(OS2) || defined(Lynx_22)
+#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(Lynx_22)
 #define USGISH
 #endif
 
@@ -691,12 +691,12 @@ void redirect(line, makefile)
         fatalerr("cannot open \"%s\"\n", makefile);
     sprintf(backup, "%s.bak", makefile);
     unlink(backup);
-#if defined(WIN32) || defined(OS2)
+#if defined(WIN32)
     fclose(fdin);
 #endif
     if (rename(makefile, backup) < 0)
         fatalerr("cannot rename %s to %s\n", makefile, backup);
-#if defined(WIN32) || defined(OS2)
+#if defined(WIN32)
     if ((fdin = fopen(backup, "r")) == NULL)
         fatalerr("cannot open \"%s\"\n", backup);
 #endif
@@ -765,7 +765,7 @@ void warning1(char *msg, ...)
 void convert_slashes(path) 
     char* path; 
 {
-#if defined (WNT) || defined(OS2)
+#if defined (WNT)
     /*
      * Convert backslashes to slashes
      */
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
index abb0649..120bddb 100644
--- a/soltools/testSHL/testshl.cxx
+++ b/soltools/testSHL/testshl.cxx
@@ -40,7 +40,7 @@ using namespace tstutl;
 void usage();
 void test_shl( vector< sal_Char* > cmdln, sal_Bool boom );
 
-#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/stlport/makefile.mk b/stlport/makefile.mk
index 06f0e88..9211a5e 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -101,8 +101,6 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
         # FreeBSD needs a special makefile
         .IF "$(OS)"=="FREEBSD"
             BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-        .ELIF "$(OS)"=="OS2"
-            BUILD_FLAGS=-f gcc-3.0-os2.mak
         .ELIF "$(GUI)"=="WNT"
             BUILD_FLAGS=-f gcc-3.0-mingw.mak
         .ELSE
@@ -164,11 +162,6 @@ OUT2BIN= \
 
 .ENDIF # "$(COM)"=="GCC"
 
-.ELIF "$(GUI)"=="OS2"
-
-OUT2LIB= lib$/*.lib
-OUT2BIN= lib$/*.dll
-
 .ELSE          # "$(GUI)"=="WNT"
 
 OUT2LIB= \