Changes for IRIX 6.x.

diff --git a/v7/src/microcode/option.c b/v7/src/microcode/option.c
index cd0d2728353eae28468edd72ac3ee836e3da4f25..6da750dba8deab38fb05b5b6a409ab95bdb2a4df 100644 (file)
--- a/v7/src/microcode/option.c
+++ b/v7/src/microcode/option.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: option.c,v 1.45 1998/04/14 05:13:40 cph Exp $
+$Id: option.c,v 1.46 1998/07/20 04:15:14 cph Exp $
 
 Copyright (c) 1990-98 Massachusetts Institute of Technology
 
@@ -49,13 +49,24 @@ extern void free ();
 extern int atoi ();
 
 #ifdef WINNT
+
 #include <io.h>
 #include <string.h>
 #include <stdlib.h>
-#else
+
+#else /* not WINNT */
+#ifdef _POSIX
+
+#include <unistd.h>
+#include <string.h>
+
+#else /* not _POSIX */
+
 extern int strlen ();
 extern char * malloc ();
-#endif
+
+#endif /* not _POSIX */
+#endif /* not WINNT */
 
 #ifndef NULL
 # define NULL 0

diff --git a/v7/src/microcode/oscond.h b/v7/src/microcode/oscond.h
index 8274eb709991959071617a3248f2a0890fc4ea85..7e3b0c7c808ea72c65bf9c3cb5f942039518841b 100644 (file)
--- a/v7/src/microcode/oscond.h
+++ b/v7/src/microcode/oscond.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: oscond.h,v 1.24 1998/04/14 05:13:44 cph Exp $
+$Id: oscond.h,v 1.25 1998/07/20 04:15:45 cph Exp $
 
 Copyright (c) 1990-98 Massachusetts Institute of Technology
 
@@ -124,7 +124,13 @@ MIT in each case. */
 #endif /* __hpux */
 #endif /* _HPUX */
 
-#ifdef _IRIX4
+#if defined(_IRIX4) || defined(_IRIX6)
+#ifndef _IRIX
+#define _IRIX
+#endif
+#endif
+
+#ifdef _IRIX
 #define _POSIX
 #define _SYSV3
 #endif

diff --git a/v7/src/microcode/regex.c b/v7/src/microcode/regex.c
index 889b8ccf8104b687259ad47b08feb6ed31a7bd07..cd96f7ac7e8bf23c4b10216c09a2d4689ab332b0 100644 (file)
--- a/v7/src/microcode/regex.c
+++ b/v7/src/microcode/regex.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: regex.c,v 1.17 1997/06/06 06:56:42 cph Exp $
+$Id: regex.c,v 1.18 1998/07/20 04:16:27 cph Exp $
 
-Copyright (c) 1987-97 Massachusetts Institute of Technology
+Copyright (c) 1987-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -49,7 +49,7 @@ extern char * malloc ();
 extern char * realloc ();
 extern void free ();
 \f
-#if defined(_IRIX4) || defined(_AIX)
+#if defined(_IRIX) || defined(_AIX)
 #define SIGN_EXTEND_CHAR(x) ((((int) (x)) >= 0x80)                     \
                             ? (((int) (x)) - 0x100)                    \
                             : ((int) (x)))

diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index 6136cecd602cc9dcea5c8c12d3bfd782bece992c..d2b7da454fac7ced701d72b1dd669d4252e046d0 100644 (file)
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: ux.h,v 1.68 1997/06/27 18:51:46 cph Exp $
+$Id: ux.h,v 1.69 1998/07/20 04:17:58 cph Exp $
 
-Copyright (c) 1988-97 Massachusetts Institute of Technology
+Copyright (c) 1988-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -59,7 +59,7 @@ extern int errno;
 
 /* These seem to be missing from versions of unistd.h */
 
-#if !(defined(_HPUX) || defined(sonyrisc) || defined(_SUNOS4))
+#if !(defined(_HPUX) || defined(sonyrisc) || defined(_SUNOS4) || defined(_IRIX6))
 /* As specified by OSF/1 Programmer's reference: */
 extern int EXFUN (ioctl, (int, unsigned long, ...));
 #endif
@@ -150,7 +150,7 @@ extern int EXFUN (kill, (pid_t, int));
 #define ERRNO_NONBLOCK EAGAIN
 #define FCNTL_NONBLOCK O_NONBLOCK
 
-#ifdef _IRIX4
+#ifdef _IRIX
 
 #define HAVE_DIR
 #define HAVE_SELECT
@@ -159,7 +159,7 @@ extern int EXFUN (kill, (pid_t, int));
 #define HAVE_SYMBOLIC_LINKS
 #define HAVE_UNIX_SOCKETS
 
-#endif /* _IRIX4 */
+#endif /* _IRIX */
 
 #ifdef _AIX
 #define UNION_WAIT_STATUS

diff --git a/v7/src/microcode/uxio.c b/v7/src/microcode/uxio.c
index 521403d6a08bab754e9566b0fe341a664cd94bd2..de473216fa77c93d363cfbb25d274e1257a9dd8e 100644 (file)
--- a/v7/src/microcode/uxio.c
+++ b/v7/src/microcode/uxio.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxio.c,v 1.41 1997/10/22 05:25:17 cph Exp $
+$Id: uxio.c,v 1.42 1998/07/20 04:18:54 cph Exp $
 
-Copyright (c) 1990-97 Massachusetts Institute of Technology
+Copyright (c) 1990-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -265,7 +265,11 @@ DEFUN (OS_channel_write_dump_file, (channel, buffer, nbytes),
   return ((scr < 0) ? 0 : scr);
 }
 
+#ifdef _POSIX
+#include <string.h>
+#else
 extern int EXFUN (strlen, (CONST char *));
+#endif
 
 void
 DEFUN (OS_channel_write_string, (channel, string),

diff --git a/v7/src/microcode/uxtrap.h b/v7/src/microcode/uxtrap.h
index e2d85e19efbffbd4eb3d25dd8440f14b1002b085..d7ea656550135ee5bd9cf49c4f347408c10e5a6f 100644 (file)
--- a/v7/src/microcode/uxtrap.h
+++ b/v7/src/microcode/uxtrap.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxtrap.h,v 1.26 1998/03/20 22:02:26 cph Exp $
+$Id: uxtrap.h,v 1.27 1998/07/20 04:19:30 cph Exp $
 
 Copyright (c) 1990-98 Massachusetts Institute of Technology
 
@@ -274,7 +274,7 @@ struct full_sigcontext
 #endif /* vax */
 \f
 #ifdef mips
-#ifdef _IRIX4
+#ifdef _IRIX
 
 /* Information on sigcontext structure in signal.h */
 
@@ -310,7 +310,7 @@ struct full_sigcontext
     (SIGSEGV, (~ 0L),       ENXIO,   "Read beyond mapped object");     \
 }
 
-#else /* not _IRIX4 */
+#else /* not _IRIX */
 #ifndef _SYSV4
 
 /* Information on sigcontext structure in signal.h */
@@ -423,7 +423,7 @@ struct full_sigcontext
 }
 
 #endif /* _SYSV4 */
-#endif /* _IRIX4 */
+#endif /* _IRIX */
 #endif /* mips */
 \f
 #if defined(i386) && defined(_MACH_UNIX)