From 3ae9cb7857bce6634ec351e99a01ae1a98f838c7 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 22 Oct 2002 02:39:37 +0000
Subject: [PATCH] Fix problem with newer version of IBM C compiler.

---
 v7/src/microcode/os2env.c        | 26 +++++++++++++++-----------
 v7/src/microcode/os2utl/config.h | 21 ++++++++++++---------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/v7/src/microcode/os2env.c b/v7/src/microcode/os2env.c
index 631cae7fc..38ac27eac 100644
--- a/v7/src/microcode/os2env.c
+++ b/v7/src/microcode/os2env.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: os2env.c,v 1.12 1999/04/07 04:01:45 cph Exp $
+$Id: os2env.c,v 1.13 2002/10/22 02:37:10 cph Exp $
 
 Copyright (c) 1994-1999 Massachusetts Institute of Technology
 
@@ -26,22 +26,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <sys\types.h>
 
 #ifdef __IBMC__
-#include <sys\timeb.h>
-#define NC_TIMEZONE _timezone
-#define NC_DAYLIGHT _daylight
-#define NC_FTIME _ftime
+#  include <sys\timeb.h>
+#  define NC_TIMEZONE _timezone
+#  define NC_DAYLIGHT _daylight
+#  if (__IBMC__ >= 360)
+#    define NC_FTIME ftime
+#  else
+#    define NC_FTIME _ftime
+#  endif
 #endif
 
 #if defined(__WATCOMC__) || defined(__EMX__)
-#include <sys\timeb.h>
-#define NC_TIMEZONE timezone
-#define NC_DAYLIGHT daylight
-#define NC_FTIME ftime
+#  include <sys\timeb.h>
+#  define NC_TIMEZONE timezone
+#  define NC_DAYLIGHT daylight
+#  define NC_FTIME ftime
 #endif
 
 #ifdef __GCC2__
-#include <errno.h>
-#include <sys/times.h>
+#  include <errno.h>
+#  include <sys/times.h>
 #endif
 
 static void initialize_real_time_clock (void);
diff --git a/v7/src/microcode/os2utl/config.h b/v7/src/microcode/os2utl/config.h
index b82ff2473..ce503e0a2 100644
--- a/v7/src/microcode/os2utl/config.h
+++ b/v7/src/microcode/os2utl/config.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: config.h,v 1.3 2001/03/01 05:23:53 cph Exp $
+$Id: config.h,v 1.4 2002/10/22 02:39:37 cph Exp $
 
-Copyright (c) 2000-2001 Massachusetts Institute of Technology
+Copyright (c) 2000-2002 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 */
 
 #ifndef SCM_CONFIG_H
@@ -30,15 +31,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <time.h>
 
 #ifndef __GNUC__
-typedef unsigned short mode_t;
-typedef short nlink_t;
-typedef long pid_t;
-typedef short uid_t;
-typedef short gid_t;
+  typedef unsigned short mode_t;
+  typedef short nlink_t;
+  typedef long pid_t;
+  typedef short uid_t;
+  typedef short gid_t;
 #endif
 
 typedef unsigned char cc_t;
-typedef long ssize_t;
+#if (! ((defined (__IBMC__)) && (__IBMC__ >= 360)))
+  typedef long ssize_t;
+#endif
 
 /* The number of bytes in a unsigned long.  */
 #define SIZEOF_UNSIGNED_LONG 4
-- 
2.25.1