From 8ef07d727935761175a5861844e6d95020f94635 Mon Sep 17 00:00:00 2001 From: "Guillermo J. Rozas" Date: Mon, 30 Jul 1990 16:37:57 +0000 Subject: [PATCH] Merge in Jmiller's last changes. --- v7/src/microcode/posixtyp.h | 4 +++- v7/src/microcode/s/ultrix.h | 14 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/v7/src/microcode/posixtyp.h b/v7/src/microcode/posixtyp.h index 0e3e70e32..e986e9132 100644 --- a/v7/src/microcode/posixtyp.h +++ b/v7/src/microcode/posixtyp.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/posixtyp.h,v 1.1 1990/06/20 19:38:14 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/posixtyp.h,v 1.2 1990/07/30 16:37:57 jinx Exp $ Copyright (c) 1990 Massachusetts Institute of Technology @@ -66,8 +66,10 @@ typedef unsigned short mode_t; #ifndef _NLINK_T #define _NLINK_T +#ifndef _ULTRIX typedef short nlink_t; #endif +#endif #ifndef _PID_T #define _PID_T diff --git a/v7/src/microcode/s/ultrix.h b/v7/src/microcode/s/ultrix.h index 4c69c6a36..873aff775 100644 --- a/v7/src/microcode/s/ultrix.h +++ b/v7/src/microcode/s/ultrix.h @@ -1,7 +1,7 @@ /* -*-C-*- System file for Ultrix -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/s/Attic/ultrix.h,v 1.7 1990/06/20 19:55:03 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/s/Attic/ultrix.h,v 1.8 1990/07/30 16:34:13 jinx Exp $ Copyright (c) 1989, 1990 Massachusetts Institute of Technology @@ -39,7 +39,10 @@ MIT in each case. */ /* This says we have curses terminal support for Edwin. */ #define HAVE_CURSES -#define C_SWITCH_SYSTEM -D_BSD4_2 -D_ULTRIX +/* This is in mips.h for some reason. */ +/* #define LIB_DEBUG */ + +#define C_SWITCH_SYSTEM -D_ULTRIX -D_BSD4_3 #define LIBS_SYSTEM -ltermcap @@ -71,7 +74,10 @@ MIT in each case. */ #define LIBX11_SYSTEM -lc -#define SOURCES_SYSTEM unixprim.c -#define OBJECTS_SYSTEM unixprim.o +/* #define SOURCES_SYSTEM unixprim.c */ +/* #define OBJECTS_SYSTEM unixprim.o */ #define ALTERNATE_M4 s/ultrix.m4 +#ifndef INSTALL_PROGRAM +#define INSTALL_PROGRAM cp +#endif -- 2.25.1