xnu-4570.41.2.tar.gz

[apple/xnu.git] / bsd / sys / types.h

diff --git a/bsd/sys/types.h b/bsd/sys/types.h
index 6590597cde2d443c4fcb59e66b5dc2f2c026ee72..f11f23ff27214e3dc1febcad41bccfbbea67e5bf 100644 (file)
--- a/bsd/sys/types.h
+++ b/bsd/sys/types.h
@@ -81,9 +81,9 @@
 #include <machine/endian.h>
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-typedef        unsigned char           u_char;
-typedef        unsigned short          u_short;
-typedef        unsigned int            u_int;
+#include <sys/_types/_u_char.h>
+#include <sys/_types/_u_short.h>
+#include <sys/_types/_u_int.h>
 #ifndef _U_LONG
 typedef        unsigned long           u_long;
 #define _U_LONG
@@ -96,7 +96,8 @@ typedef       u_int64_t               u_quad_t;       /* quads */
 typedef        int64_t                 quad_t;
 typedef        quad_t *                qaddr_t;
 
-typedef        char *                  caddr_t;        /* core address */
+#include <sys/_types/_caddr_t.h>       /* core address */
+
 typedef        int32_t                 daddr_t;        /* disk address */
 
 #include <sys/_types/_dev_t.h>                 /* device number */
@@ -220,21 +221,25 @@ struct    uio;
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 #endif /* __ASSEMBLER__ */
 
+#ifndef KERNEL
+
 #ifndef __POSIX_LIB__
 
-#include <sys/_types/_pthread_attr_t.h>
-#include <sys/_types/_pthread_cond_t.h>
-#include <sys/_types/_pthread_condattr_t.h>
-#include <sys/_types/_pthread_mutex_t.h>
-#include <sys/_types/_pthread_mutexattr_t.h>
-#include <sys/_types/_pthread_once_t.h>
-#include <sys/_types/_pthread_rwlock_t.h>
-#include <sys/_types/_pthread_rwlockattr_t.h>
-#include <sys/_types/_pthread_t.h>
+#include <sys/_pthread/_pthread_attr_t.h>
+#include <sys/_pthread/_pthread_cond_t.h>
+#include <sys/_pthread/_pthread_condattr_t.h>
+#include <sys/_pthread/_pthread_mutex_t.h>
+#include <sys/_pthread/_pthread_mutexattr_t.h>
+#include <sys/_pthread/_pthread_once_t.h>
+#include <sys/_pthread/_pthread_rwlock_t.h>
+#include <sys/_pthread/_pthread_rwlockattr_t.h>
+#include <sys/_pthread/_pthread_t.h>
 
 #endif /* __POSIX_LIB__ */
 
-#include <sys/_types/_pthread_key_t.h>
+#include <sys/_pthread/_pthread_key_t.h>
+
+#endif /* KERNEL */
 
 /* statvfs and fstatvfs */