[Libreoffice-commits] .: filter/source

[François Tigeot]

 filter/source/config/cache/filtercache.cxx   |    2 +-
 filter/source/graphicfilter/icgm/makefile.mk |    4 ----
 filter/source/graphicfilter/ieps/ieps.cxx    |    2 +-
 filter/source/placeware/tempfile.cxx         |    2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 51ed2adad1f43c261f3a56f1dd68afbab2ef1c49
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sat Apr 30 08:48:50 2011 +0200

    Remove OS/2 support

diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index b1d2ad2..5ee046c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -209,7 +209,7 @@ void FilterCache::load(EFillState eRequired,
     if ((m_eFillState & eRequired) == eRequired)
         return;
 
-#if OSL_DEBUG_LEVEL > 1 && !defined(OS2)
+#if OSL_DEBUG_LEVEL > 1
     if (
         (!bByThread) &&
         (
diff --git a/filter/source/graphicfilter/icgm/makefile.mk b/filter/source/graphicfilter/icgm/makefile.mk
index f8dc889..a9591fe 100644
--- a/filter/source/graphicfilter/icgm/makefile.mk
+++ b/filter/source/graphicfilter/icgm/makefile.mk
@@ -61,10 +61,6 @@ SHL1LIBS	=	$(SLB)$/icgm.lib
 
 DEF1NAME=$(SHL1TARGET)
 
-.IF "$(GUI)"=="OS2"
-SHL1OBJS	=	$(SLO)$/class0.obj
-.ENDIF
-
 SHL1STDLIBS = \
             $(TKLIB)		\
             $(VCLLIB)		\
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 2d2505c..789b511 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -195,7 +195,7 @@ static oslProcessError runProcessWithPathSearch(const rtl::OUString &rProgName,
 #endif
 }
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 #    define EXESUFFIX ".exe"
 #else
 #    define EXESUFFIX ""
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index de38d6b..3f25b9b 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -33,7 +33,7 @@
 #include <osl/file.h>
 #include <sal/macros.h>
 
-#if defined( UNX) || defined(OS2)
+#if defined( UNX)
 
 #include <stdio.h>
 #include <string.h>