There's also no point in #typedef'ing void/char pointers. Accordingly,

rip out ClientData/Address pointers and use standard types.

Obtained from:	OpenBSD

1 files changed, 2 insertions, 43 deletions

diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index fd2cef6..6e3207b 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -48,7 +48,6 @@
 #ifndef _SPRITE
 #define _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.
@@ -62,49 +61,9 @@ typedef int Boolean;
 #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
-
-
-/*
- * A nil pointer must be something that will cause an exception if
- * referenced.  There are two nils: the kernels nil and the nil used
- * by user processes.
- */
-
-#ifndef NULL
-#define NULL	 	0
-#endif /* NULL */
-
-/*
- * An address is just a pointer in C.  It is defined as a character pointer
- * so that address arithmetic will work properly, a byte at a time.
- */
-
-typedef char *Address;
-
-/*
- * ClientData is an uninterpreted word.  It is defined as an int so that
- * kdbx will not interpret client data as a string.  Unlike an "Address",
- * client data will generally not be used in arithmetic.
- * But we don't have kdbx anymore so we define it as void (christos)
- */
-
-typedef void *ClientData;
+#define SUCCESS		0
+#define FAILURE		1
 
 #endif /* _SPRITE */