unifdef -U__UNIXOS2__

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 5 insertions, 28 deletions

diff --git a/imake.c b/imake.c
index a80e34a..7ea13e6 100644
--- a/imake.c
+++ b/imake.c
@@ -1387,7 +1387,7 @@ get_gcc(char *cmd)
     return FALSE;
 }
 
-#if defined CROSSCOMPILE || !defined __UNIXOS2__
+#ifdef CROSSCOMPILE
 static void
 get_gcc_incdir(FILE *inFile, char* name)
 {
@@ -1416,7 +1416,7 @@ get_gcc_incdir(FILE *inFile, char* name)
 boolean
 define_os_defaults(FILE *inFile)
 {
-#if defined CROSSCOMPILE || ( !defined(WIN32) && !defined(__UNIXOS2__) )
+#if defined CROSSCOMPILE || !defined(WIN32)
 # ifdef CROSSCOMPILE
 #  ifdef __GNUC__
   if (1)
@@ -1636,10 +1636,8 @@ define_os_defaults(FILE *inFile)
 	  char name[PATH_MAX];
 	  if (get_gcc(name)) {
 	      get_gcc_version (inFile,name);
-#  if defined CROSSCOMPILE || !defined __UNIXOS2__
-#   if defined CROSSCOMPILE
+#  if defined CROSSCOMPILE
 	      if (sys != emx)
-#   endif
 		  get_gcc_incdir(inFile,name);
 #  endif
 	  }
@@ -1652,7 +1650,7 @@ define_os_defaults(FILE *inFile)
 	  get_binary_format(inFile);
 # endif
     }
-#endif /* !WIN32 && !__UNIXOS2__*/
+#endif /* !WIN32 */
 #if defined WIN32
 # ifdef CROSSCOMPILE
   else if (sys == win32 && !CrossCompiling)
@@ -1676,8 +1674,6 @@ define_os_defaults(FILE *inFile)
 #endif /* WIN32 */
 #ifdef CROSSCOMPILE
   else if (sys == emx)
-#endif
-#if defined CROSSCOMPILE || defined __UNIXOS2__
     {
       fprintf(inFile, "#define DefaultOSMajorVersion 4\n");
       fprintf(inFile, "#define DefaultOSMinorVersion 0\n");
diff --git a/imakemdep.h b/imakemdep.h
index 61dc4e0..1de1e7b 100644
--- a/imakemdep.h
+++ b/imakemdep.h
@@ -31,9 +31,6 @@ in this Software without prior written authorization from The Open Group.
  * definitions.  In general you should *not* edit ccimake.c or imake.c!
  */
 
-#ifdef __UNIXOS2__
-# define lstat stat
-#endif
 
 #ifdef CCIMAKE
 /*
@@ -201,11 +198,6 @@ in this Software without prior written authorization from The Open Group.
 #  define imake_ccflags "-DNOSTDHDRS"
 # endif
 
-/* this is for OS/2 under UNIXOS2. This won't work with DOS */
-# if defined(__UNIXOS2__)
-#  define imake_ccflags "-DBSD43"
-# endif
-
 # if defined(__QNX__) && !defined(__QNXNTO__)
 #  define imake_ccflags "-D__QNX__ -D_i386"
 # endif
@@ -237,7 +229,7 @@ in this Software without prior written authorization from The Open Group.
  *     all colons).  One way to tell if you need this is to see whether or not
  *     your Makefiles have no tabs in them and lots of @@ strings.
  */
-#  if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__SCO__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || defined(__UNIXOS2__) || defined(__UNIXWARE__)
+#  if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__SCO__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || defined(__UNIXWARE__)
 #   define FIXUP_CPP_WHITESPACE
 #  endif
 #  ifdef WIN32
@@ -321,10 +313,6 @@ in this Software without prior written authorization from The Open Group.
 #   ifdef __minix_vmd
 #    define DEFAULT_CPP "/usr/lib/cpp"
 #   endif
-#   if defined(__UNIXOS2__)
-/* expects cpp in PATH */
-#    define DEFAULT_CPP "cpp"
-#   endif
 #   ifdef __CYGWIN__
 #    define DEFAULT_CC "gcc"
 #    define DEFAULT_CPP "/usr/bin/cpp"
@@ -708,10 +696,6 @@ const char *cpp_argv[ARGUMENTS] = {
 	"-Dminix",
 #   endif
 
-#   if defined(__UNIXOS2__)
-	"-traditional",
-	"-Demxos2",
-#   endif
 #   ifdef MetroLink
 	"-DMetroLink",
 #    ifdef SVR4
@@ -1312,9 +1296,6 @@ struct symtab	predefs[] = {
 #   ifdef __ELF__
 	{"__ELF__", "1"},
 #   endif
-#   ifdef __UNIXOS2__
-	{"__UNIXOS2__", "1"},
-#   endif
 #   if defined(__QNX__)
         {"__QNX__", "1"},
 #   endif