head: sys: Fix up sys/types.h

Signed-off-by: Ian Moffett <ian@mirocom.org>

usr/src/head/sys/types.h

@@ -14,20 +14,7 @@
 
 #if defined(_KERNEL) || defined(_SP1_SOURCE)
 #include <sys/_null.h>
-
-#ifndef bool
-typedef _Bool bool;
-#endif  /* !bool */
-
-#ifndef true
-#define true 1
-#endif  /* !true */
-
-#ifndef false
-#define false 0
-#endif  /* !false */
-
-#endif  /* !_KERNEL || SP1_SOURCE */
+#endif  /* _KERNEL || _SP1_SOURCE */
 
 /* Unsigned types */
 typedef unsigned char       __uint8_t;
@@ -45,54 +32,21 @@ typedef long long   __int64_t;
 typedef __int64_t   __ssize_t;
 typedef __ssize_t   __off_t;
 
-#if defined(_KERNEL) || defined(SP1_SOURCE)
-#ifndef uint8_t
+#if defined(_KERNEL) || defined(_SP1_SOURCE)
 typedef __uint8_t   uint8_t;
-#endif  /* !uint8_t */
-
-#ifndef uint16_t
 typedef __uint16_t  uint16_t;
-#endif  /* !uint16_t */
-
-#ifndef uint32_t
 typedef __uint32_t  uint32_t;
-#endif  /* !uint32_t */
-
-#ifndef uint64_t
 typedef __uint64_t  uint64_t;
-#endif  /* !uint64_t */
-
-#ifndef uintptr_t
 typedef __uint64_t  uintptr_t;
-#endif  /* !uintptr_t */
-
-#ifndef size_t
 typedef __size_t  size_t;
-#endif  /* !size_t */
 
-#ifndef int8_t
 typedef __int8_t    int8_t;
-#endif  /* !int8_t */
-
-#ifndef int16_t
 typedef __int16_t   int16_t;
-#endif  /* !int16_t */
-
-#ifndef int16_t
 typedef __int32_t   int32_t;
-#endif  /* !int32_t */
-
-#ifndef int64_t
 typedef __int64_t   int64_t;
-#endif  /* !int64_t */
 
-#ifndef ssize_t
 typedef __ssize_t ssize_t;
-#endif  /* !ssize_t */
-
-#ifndef intmax_t
 typedef __ssize_t intmax_t;
-#endif  /* !intmax_t */
 
 #endif  /* !_KERNEL || _SP1_SOURCE */