Module Name: src
Committed By: rillig
Date: Wed Aug 26 23:00:47 UTC 2020
Modified Files:
src/usr.bin/make: Makefile hash.c lst.h make.h
Removed Files:
src/usr.bin/make: sprite.h
Log Message:
make(1): remove header sprite.h
Make is independent of the Sprite operating system.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/usr.bin/make/Makefile
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/hash.c
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/make/lst.h
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/make/make.h
cvs rdiff -u -r1.14 -r0 src/usr.bin/make/sprite.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.93 src/usr.bin/make/Makefile:1.94
--- src/usr.bin/make/Makefile:1.93 Tue Aug 25 16:39:19 2020
+++ src/usr.bin/make/Makefile Wed Aug 26 23:00:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2020/08/25 16:39:19 rillig Exp $
+# $NetBSD: Makefile,v 1.94 2020/08/26 23:00:47 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -37,7 +37,6 @@ HDRS+= meta.h
HDRS+= metachar.h
HDRS+= nonints.h
HDRS+= pathnames.h
-HDRS+= sprite.h
HDRS+= strlist.h
HDRS+= trace.h
Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.26 src/usr.bin/make/hash.c:1.27
--- src/usr.bin/make/hash.c:1.26 Sat Aug 1 14:47:49 2020
+++ src/usr.bin/make/hash.c Wed Aug 26 23:00:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $ */
+/* $NetBSD: hash.c,v 1.27 2020/08/26 23:00:47 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.27 2020/08/26 23:00:47 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.27 2020/08/26 23:00:47 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -89,9 +89,7 @@ __RCSID("$NetBSD: hash.c,v 1.26 2020/08/
* table. Hash tables grow automatically as the amount of
* information increases.
*/
-#include "sprite.h"
#include "make.h"
-#include "hash.h"
/*
* Forward references to local procedures that are used before they're
Index: src/usr.bin/make/lst.h
diff -u src/usr.bin/make/lst.h:1.44 src/usr.bin/make/lst.h:1.45
--- src/usr.bin/make/lst.h:1.44 Wed Aug 26 22:55:46 2020
+++ src/usr.bin/make/lst.h Wed Aug 26 23:00:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.h,v 1.44 2020/08/26 22:55:46 rillig Exp $ */
+/* $NetBSD: lst.h,v 1.45 2020/08/26 23:00:47 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -83,8 +83,6 @@
#include <sys/param.h>
#include <stdlib.h>
-#include "sprite.h"
-
/*
* basic typedef. This is what the Lst_ functions handle
*/
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.126 src/usr.bin/make/make.h:1.127
--- src/usr.bin/make/make.h:1.126 Mon Aug 24 20:15:51 2020
+++ src/usr.bin/make/make.h Wed Aug 26 23:00:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.126 2020/08/24 20:15:51 rillig Exp $ */
+/* $NetBSD: make.h,v 1.127 2020/08/26 23:00:47 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -128,7 +128,37 @@
#define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg) /* delete */
#endif
-#include "sprite.h"
+/*
+ * A boolean type is defined as an integer, not an enum. This allows a
+ * boolean argument to be an expression that isn't strictly 0 or 1 valued.
+ */
+
+typedef int Boolean;
+#ifndef TRUE
+#define TRUE 1
+#endif /* TRUE */
+#ifndef FALSE
+#define FALSE 0
+#endif /* FALSE */
+
+/*
+ * Functions that must return a status can return a ReturnStatus to
+ * indicate success or type of failure.
+ */
+
+typedef int ReturnStatus;
+
+/*
+ * The following statuses overlap with the first 2 generic statuses
+ * defined in status.h:
+ *
+ * SUCCESS There was no error.
+ * FAILURE There was a general error.
+ */
+
+#define SUCCESS 0x00000000
+#define FAILURE 0x00000001
+
#include "lst.h"
#include "hash.h"
#include "config.h"
