Move the Boolean and ReturnStatus stuff from sprite.h to util.h and

get rid of sprite.h.

Obtained from:	DragonFlyBSD

16 files changed, 27 insertions, 81 deletions

diff --git a/usr.bin/make/GNode.h b/usr.bin/make/GNode.h
index 23e68aa..382da55 100644
--- a/usr.bin/make/GNode.h
+++ b/usr.bin/make/GNode.h
@@ -41,8 +41,8 @@
 #ifndef GNode_h_39503bf2
 #define	GNode_h_39503bf2
 
-#include "sprite.h"
 #include "lst.h"
+#include "util.h"
 
 struct Suff;
 
diff --git a/usr.bin/make/arch.h b/usr.bin/make/arch.h
index 5b2542f..d9976b7 100644
--- a/usr.bin/make/arch.h
+++ b/usr.bin/make/arch.h
@@ -41,7 +41,7 @@
 #ifndef arch_h_488adf7a
 #define	arch_h_488adf7a
 
-#include "sprite.h"
+#include "util.h"
 
 struct GNode;
 struct Lst;
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index a6e0aa1..6453abf 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 
 #include "buf.h"
-#include "sprite.h"
 #include "util.h"
 
 /**
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 0ff54d9..106f348 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -50,7 +50,7 @@
 
 #include <sys/types.h>
 
-#include "sprite.h"
+#include "util.h"
 
 /*
  * There are several places where expandable buffers are used (parse.c and
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index a9209b1..bed2c57 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
 #include "GNode.h"
 #include "make.h"
 #include "parse.h"
-#include "sprite.h"
 #include "str.h"
 #include "targ.h"
 #include "util.h"
diff --git a/usr.bin/make/for.h b/usr.bin/make/for.h
index 052e194..0e43c4a 100644
--- a/usr.bin/make/for.h
+++ b/usr.bin/make/for.h
@@ -41,7 +41,7 @@
 #ifndef for_h_9d770f33
 #define	for_h_9d770f33
 
-#include "sprite.h"
+#include "util.h"
 
 Boolean For_For(char *);
 Boolean For_Eval(char *);
diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h
index e6d1e65..4982a9f 100644
--- a/usr.bin/make/globals.h
+++ b/usr.bin/make/globals.h
@@ -49,7 +49,7 @@
 #include <stdint.h>
 
 #include "lst.h"
-#include "sprite.h"
+#include "util.h"
 
 struct GNode;
 struct Path;
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 503d328..b5ea6bc 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 #include "hash.h"
-#include "sprite.h"
 #include "util.h"
 
 /*
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index d537b2a..80dd74d 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -49,7 +49,7 @@
  * 	which maintains hash tables.
  */
 
-#include "sprite.h"
+#include "util.h"
 
 /*
  * The following defines one entry in the hash table.
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index e908653..af9b5bd 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -50,7 +50,7 @@
 
 #include <stdio.h>
 
-#include "sprite.h"
+#include "util.h"
 
 struct Buffer;
 struct GNode;
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 68d7110..1b734c6 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -48,7 +48,7 @@
  *	Header for using the list library
  */
 
-#include "sprite.h"
+#include "util.h"
 
 /*
  * Structure of a list node.
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 6bf7aa1..e8d5660 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -47,7 +47,7 @@
  *	The global definitions for make
  */
 
-#include "sprite.h"
+#include "util.h"
 
 struct GNode;
 struct Lst;
diff --git a/usr.bin/make/parse.h b/usr.bin/make/parse.h
index ec1a478..6ee15f9 100644
--- a/usr.bin/make/parse.h
+++ b/usr.bin/make/parse.h
@@ -43,7 +43,7 @@
 
 #include <stdio.h>
 
-#include "sprite.h"
+#include "util.h"
 
 struct GNode;
 struct Lst;
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
deleted file mode 100644
index 156318a..0000000
--- a/usr.bin/make/sprite.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1988, 1989, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * 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.
- *
- *	@(#)sprite.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
- */
-
-#ifndef sprite_h_000823c6
-#define	sprite_h_000823c6
-
-/*
- * sprite.h --
- *
- * Common constants and type declarations for Sprite.
- */
-
-/*
- * 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
-#define	FALSE	0
-#endif /* TRUE */
-
-typedef int  ReturnStatus;
-
-#define	SUCCESS		0
-#define	FAILURE		1
-
-#endif /* sprite_h_000823c6 */
diff --git a/usr.bin/make/str.h b/usr.bin/make/str.h
index 0646337..b50ed6c 100644
--- a/usr.bin/make/str.h
+++ b/usr.bin/make/str.h
@@ -41,7 +41,7 @@
 #ifndef str_h_44db59e6
 #define	str_h_44db59e6
 
-#include "sprite.h"
+#include "util.h"
 
 struct Buffer;
 
diff --git a/usr.bin/make/util.h b/usr.bin/make/util.h
index 44d3d9e..139e9a3 100644
--- a/usr.bin/make/util.h
+++ b/usr.bin/make/util.h
@@ -44,6 +44,22 @@
 #include <sys/types.h>
 #include <stdio.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
+#define	FALSE	0
+#endif /* TRUE */
+
+typedef int  ReturnStatus;
+
+#define	SUCCESS		0
+#define	FAILURE		1
+
 #define	CONCAT(a,b)	a##b
 
 struct flag2str {