[src/trunk]: src/usr.bin/make make(1): remove header sprite.h

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ac8216f75a5
branches:  trunk
changeset: 937789:7ac8216f75a5
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Aug 26 23:00:47 2020 +0000

description:
make(1): remove header sprite.h

Make is independent of the Sprite operating system.

diffstat:

 usr.bin/make/Makefile |    3 +-
 usr.bin/make/hash.c   |    8 +--
 usr.bin/make/lst.h    |    4 +-
 usr.bin/make/make.h   |   34 +++++++++++++-
 usr.bin/make/sprite.h |  116 --------------------------------------------------
 5 files changed, 37 insertions(+), 128 deletions(-)

diffs (239 lines):

diff -r 09eff3437208 -r 7ac8216f75a5 usr.bin/make/Makefile
--- a/usr.bin/make/Makefile     Wed Aug 26 22:57:55 2020 +0000
+++ b/usr.bin/make/Makefile     Wed Aug 26 23:00:47 2020 +0000
@@ -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+=  metachar.h
 HDRS+=  nonints.h
 HDRS+=  pathnames.h
-HDRS+=  sprite.h
 HDRS+=  strlist.h
 HDRS+=  trace.h
 
diff -r 09eff3437208 -r 7ac8216f75a5 usr.bin/make/hash.c
--- a/usr.bin/make/hash.c       Wed Aug 26 22:57:55 2020 +0000
+++ b/usr.bin/make/hash.c       Wed Aug 26 23:00:47 2020 +0000
@@ -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 @@
  *     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
diff -r 09eff3437208 -r 7ac8216f75a5 usr.bin/make/lst.h
--- a/usr.bin/make/lst.h        Wed Aug 26 22:57:55 2020 +0000
+++ b/usr.bin/make/lst.h        Wed Aug 26 23:00:47 2020 +0000
@@ -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
  */
diff -r 09eff3437208 -r 7ac8216f75a5 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Wed Aug 26 22:57:55 2020 +0000
+++ b/usr.bin/make/make.h       Wed Aug 26 23:00:47 2020 +0000
@@ -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"
diff -r 09eff3437208 -r 7ac8216f75a5 usr.bin/make/sprite.h
--- a/usr.bin/make/sprite.h     Wed Aug 26 22:57:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*     $NetBSD: sprite.h,v 1.14 2017/05/31 22:02:06 maya Exp $ */
-
-/*
- * Copyright (c) 1988, 1989, 1990, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Adam de Boor.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *     from: @(#)sprite.h      8.1 (Berkeley) 6/6/93
- */
-
-/*
- * Copyright (c) 1989 by Berkeley Softworks
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Adam de Boor.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *     from: @(#)sprite.h      8.1 (Berkeley) 6/6/93
- */
-
-/*
- * sprite.h --
- *
- * Common constants and type declarations for Sprite.
- */
-
-#ifndef MAKE_SPRITE_H
-#define MAKE_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
-
-#endif /* MAKE_SPRITE_H */