49 lines
1.3 KiB
Text
49 lines
1.3 KiB
Text
$NetBSD: patch-ab,v 1.2 1998/08/07 11:13:47 agc Exp $
|
|
|
|
--- ../source/global.h.orig Fri Mar 25 14:01:46 1994
|
|
+++ ../source/global.h Tue Jul 14 13:20:11 1998
|
|
@@ -7,23 +7,17 @@
|
|
#ifndef _GLOBAL_H_
|
|
#define _GLOBAL_H_ 1
|
|
|
|
-/* PROTOTYPES should be set to one if and only if the compiler supports
|
|
- function argument prototyping.
|
|
- The following makes PROTOTYPES default to 1 if it has not already been
|
|
- defined as 0 with C compiler flags.
|
|
- */
|
|
-#ifndef PROTOTYPES
|
|
-#define PROTOTYPES 1
|
|
-#endif
|
|
+#include <sys/types.h>
|
|
+#include <sys/cdefs.h>
|
|
|
|
/* POINTER defines a generic pointer type */
|
|
-typedef unsigned char *POINTER;
|
|
+typedef caddr_t POINTER;
|
|
|
|
/* UINT2 defines a two byte word */
|
|
-typedef unsigned short int UINT2;
|
|
+typedef u_int16_t UINT2;
|
|
|
|
/* UINT4 defines a four byte word */
|
|
-typedef unsigned long int UINT4;
|
|
+typedef u_int32_t UINT4;
|
|
|
|
#ifndef NULL_PTR
|
|
#define NULL_PTR ((POINTER)0)
|
|
@@ -33,14 +27,6 @@
|
|
#define UNUSED_ARG(x) x = *(&x);
|
|
#endif
|
|
|
|
-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
|
|
- If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
|
|
- returns an empty list.
|
|
- */
|
|
-#if PROTOTYPES
|
|
-#define PROTO_LIST(list) list
|
|
-#else
|
|
-#define PROTO_LIST(list) ()
|
|
-#endif
|
|
+#define PROTO_LIST(x) __P(x)
|
|
|
|
#endif /* end _GLOBAL_H_ */
|