fix POSIX namespace pollution in sys/types.h

int8_t, u_int8_t, etc types are moved under _BSD_SOURCE

diff --git a/include/sys/types.h b/include/sys/types.h
index 27170f6443b85bfbb2c4c776013add74b1a13e11..f00db03e6db2688a214080d4ded5e8e868c102f0 100644 (file)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -20,11 +20,6 @@ extern "C" {
 #define __NEED_timer_t
 #define __NEED_clockid_t
 
-#define __NEED_int8_t
-#define __NEED_int16_t
-#define __NEED_int32_t
-#define __NEED_int64_t
-
 #define __NEED_blkcnt_t
 #define __NEED_fsblkcnt_t
 #define __NEED_fsfilcnt_t
@@ -49,19 +44,22 @@ extern "C" {
 #define __NEED_pthread_key_t
 #define __NEED_pthread_once_t
 #define __NEED_useconds_t
-#define __NEED_u_int64_t
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __NEED_int8_t
+#define __NEED_int16_t
+#define __NEED_int32_t
+#define __NEED_int64_t
+#define __NEED_u_int64_t
 #define __NEED_register_t
 #endif
 
 #include <bits/alltypes.h>
 
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 typedef unsigned char u_int8_t;
 typedef unsigned short u_int16_t;
 typedef unsigned u_int32_t;
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 typedef char *caddr_t;
 typedef unsigned char u_char;
 typedef unsigned short u_short, ushort;
@@ -87,5 +85,3 @@ typedef unsigned long long u_quad_t;
 }
 #endif
 #endif
-
-