From 571735b57193336e0e91e4df63fa07d892bcaa5d Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 16 Jan 1991 00:34:58 +0000
Subject: [PATCH] Add conditionalization to distinguish versions 1.0 and 2.0 of
 NeXT OS.

---
 v7/src/microcode/oscond.h   | 17 +++++++++++++++--
 v7/src/microcode/s/nextos.h |  6 +++---
 v7/src/microcode/ux.h       |  8 ++++----
 v7/src/microcode/uxtrap.c   |  6 +++---
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/v7/src/microcode/oscond.h b/v7/src/microcode/oscond.h
index 9c3666e81..594075397 100644
--- a/v7/src/microcode/oscond.h
+++ b/v7/src/microcode/oscond.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/oscond.h,v 1.3 1990/08/10 02:02:25 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/oscond.h,v 1.4 1991/01/16 00:34:45 cph Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990, 1991 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -84,6 +84,19 @@ MIT in each case. */
 #define _SYSV
 #endif
 
+#if defined(_NEXTOS)
+
+#define _BSD4_3
+
+#include <sys/port.h>
+#ifdef PORT_BACKLOG_DEFAULT
+#define _NEXTOS_VERSION 20
+#else
+#define _NEXTOS_VERSION 10
+#endif
+
+#endif /* _NEXTOS */
+
 #if defined(_ULTRIX)
 #define _POSIX
 #define _BSD4_3
diff --git a/v7/src/microcode/s/nextos.h b/v7/src/microcode/s/nextos.h
index 9f0a9a604..29dc08fcb 100644
--- a/v7/src/microcode/s/nextos.h
+++ b/v7/src/microcode/s/nextos.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    System file for NeXT running Mach
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/s/Attic/nextos.h,v 1.2 1990/10/16 20:57:07 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/s/Attic/nextos.h,v 1.3 1991/01/16 00:34:58 cph Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990, 1991 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,6 +33,6 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-#define C_SWITCH_SYSTEM -bsd -fwritable-strings -D_BSD4_3
+#define C_SWITCH_SYSTEM -bsd -fwritable-strings -D_NEXTOS
 
 #define LIBS_TERMCAP -ltermcap
diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index 66440e7b6..901f20d49 100644
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/ux.h,v 1.16 1991/01/07 23:56:58 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/ux.h,v 1.17 1991/01/16 00:34:21 cph Exp $
 
-Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 1990, 1991 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -116,7 +116,7 @@ extern void EXFUN (error_system_call, (int code, CONST char * name));
 /* #define HAVE_WAIT4 */
 #define UNION_WAIT_STATUS
 
-#if defined(_ULTRIX) || defined(_SUNOS4) || defined(sun4) || defined(NeXT)
+#if defined(_ULTRIX) || defined(_SUNOS4) || defined(sun4) || defined(_NEXTOS)
 #define VOID_SIGNAL_HANDLERS
 #endif
 
@@ -218,7 +218,7 @@ extern void EXFUN (error_system_call, (int code, CONST char * name));
 #define SYSTEM_VARIANT "Ultrix"
 #endif
 
-#ifdef NeXT
+#ifdef _NEXTOS
 #define SYSTEM_VARIANT "NeXT"
 #endif
 
diff --git a/v7/src/microcode/uxtrap.c b/v7/src/microcode/uxtrap.c
index f844a003b..85d964a0b 100644
--- a/v7/src/microcode/uxtrap.c
+++ b/v7/src/microcode/uxtrap.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/uxtrap.c,v 1.6 1990/12/30 02:00:19 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/uxtrap.c,v 1.7 1991/01/16 00:34:33 cph Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990, 1991 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -414,7 +414,7 @@ DEFUN (continue_from_trap, (signo, code, scp),
 static SCHEME_OBJECT * EXFUN
   (find_block_address, (char * pc_value, SCHEME_OBJECT * area_start));
 
-#ifndef NeXT
+#if !(defined (_NEXTOS) && (_NEXTOS_VERSION >= 20))
 extern long etext;
 #define get_etext() (&etext)
 #endif
-- 
2.25.1