9 files changed, 10 insertions, 12 deletions
diff --git a/xml2cmp/source/finder/makefile.mk b/xml2cmp/source/finder/makefile.mk
index 22ae524f360c..c850ec764fd0 100644
--- a/xml2cmp/source/finder/makefile.mk
+++ b/xml2cmp/source/finder/makefile.mk
@@ -49,9 +49,7 @@ OBJFILES= \
 # --- Targets ------------------------------------------------------
 
 APP1TARGET=	$(TARGET)
-.IF "$(GUI)"!="OS2"
 APP1STACK=	1000000
-.ENDIF
 
 LIBSALCPPRT=$(0)
 
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx
index 7ca25d3562c4..2af998cfd922 100644
--- a/xml2cmp/source/support/cmdline.cxx
+++ b/xml2cmp/source/support/cmdline.cxx
@@ -163,7 +163,7 @@ CommandLine::ParseIndexCommand( int                 argc,
                     argv  );
 
     sIndexFile = sOutputDirectory;
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     sIndexFile+= "\\xmlindex.html";
 #elif defined(UNX)
     sIndexFile+= "/xmlindex.html";
diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx
index fd26acc6bfd4..b6091e0b6917 100644
--- a/xml2cmp/source/support/syshelp.cxx
+++ b/xml2cmp/source/support/syshelp.cxx
@@ -37,7 +37,7 @@
 
 #ifdef WNT
 #include <io.h>
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
@@ -205,7 +205,7 @@ GatherFileNames( List<Simstr> &     o_sFiles,
 
     _findclose(hFile);
     delete [] sFilter;
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
     DIR * pDir = opendir( i_sSrcDirectory );
     dirent * pEntry = 0;
     char * sEnding;
@@ -287,7 +287,7 @@ GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
     _findclose(hFile);
     delete [] sFilter;
 
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
     DIR * pDir = opendir( i_sParentdDirectory );
     dirent * pEntry = 0;
     struct stat     aEntryStatus;
diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx
index d735ef4971d6..dda50c276e57 100644
--- a/xml2cmp/source/support/syshelp.hxx
+++ b/xml2cmp/source/support/syshelp.hxx
@@ -41,7 +41,7 @@ class Simstr;
 template <class XY> class List;
 
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 const char   C_sSLASH[] = "\\";
 const char   C_cSLASH = '\\';
 #elif defined(UNX)
diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx
index e180f7933c77..c8d35c6e5de0 100644
--- a/xml2cmp/source/xcd/cr_html.cxx
+++ b/xml2cmp/source/xcd/cr_html.cxx
@@ -54,7 +54,7 @@ HtmlCreator::HtmlCreator( const char *              i_pOutputFileName,
                           const XmlElement &        i_rDocument,
                           const Simstr &            i_sIDL_BaseDirectory )
     :   aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
                                                              ),
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index 7ef7cf85a330..927517558f3b 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -159,7 +159,7 @@ Index::CreateHtmlFileName(  char *                      o_sOutputHtml,
     }
 
     strcpy( o_sOutputHtml, sOutputDirectory.str() );        // STRCPY SAFE HERE
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     strcat(o_sOutputHtml, "\\");                            // STRCAT SAFE HERE
 #elif defined(UNX)
     strcat(o_sOutputHtml, "/");                             // STRCAT SAFE HERE
diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
index a5bf2f7d4226..74e0d728cfb6 100644
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ b/xml2cmp/source/xcd/cr_metho.cxx
@@ -64,7 +64,7 @@ Create_AccessMethod( const char *           i_pOutputFileName,
     int    sDescrLen = (int) strlen(sDescrLineChange);
 
     std::ofstream aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
     );
diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx
index e1e318953ca4..4f65659d32b6 100644
--- a/xml2cmp/source/xcd/filebuff.cxx
+++ b/xml2cmp/source/xcd/filebuff.cxx
@@ -44,7 +44,7 @@ LoadXmlFile( Buffer &           o_rBuffer,
     std::ifstream aXmlFile;
 
     aXmlFile.open(i_sXmlFilePath, std::ios::in
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                           | std::ios::binary
 #endif // WNT
     );
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index e2436ede9854..5a42d51db90b 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -185,7 +185,7 @@ Put2File_TypeInfo( const char *            i_sOutputFile,
                    ModuleDescription &     i_rData )
 {
     std::ofstream aOut(i_sOutputFile, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
     );