xnu-792.6.61.tar.gz

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

diff --git a/bsd/i386/types.h b/bsd/i386/types.h
index f370e9bf1b0caa88f3ebee370c8de64c397a2513..ab1c10837b68977b0a875e4a81d67c5fbc55936b 100644 (file)
--- a/bsd/i386/types.h
+++ b/bsd/i386/types.h
@@ -61,26 +61,59 @@
 #define        _MACHTYPES_H_
 
 #ifndef __ASSEMBLER__
+#include <i386/_types.h>
 #include <sys/cdefs.h>
 /*
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
+#ifndef _INT8_T
+#define _INT8_T
 typedef        __signed char           int8_t;
+#endif
 typedef        unsigned char           u_int8_t;
+#ifndef _INT16_T
+#define _INT16_T
 typedef        short                   int16_t;
+#endif
 typedef        unsigned short          u_int16_t;
+#ifndef _INT32_T
+#define _INT32_T
 typedef        int                     int32_t;
+#endif
 typedef        unsigned int            u_int32_t;
+#ifndef _INT64_T
+#define _INT64_T
 typedef        long long               int64_t;
+#endif
 typedef        unsigned long long      u_int64_t;
 
 typedef int32_t                        register_t;
 
-typedef long int               intptr_t;
+#ifndef _INTPTR_T
+#define _INTPTR_T
+typedef __darwin_intptr_t      intptr_t;
+#endif
+#ifndef _UINTPTR_T
+#define _UINTPTR_T
 typedef unsigned long int      uintptr_t;
+#endif
 
+/* These types are used for  reserving the largest possible size. */
+// LP64todo - typedef mach_vm_address_t        user_addr_t;    /* varying length pointers from user space */ 
+// LP64todo - typedef mach_vm_size_t           user_size_t;    /* varying length values from user space (unsigned) */
+typedef u_int32_t              user_addr_t;    
+typedef u_int32_t              user_size_t;    
+typedef int32_t                        user_ssize_t;
+typedef int32_t                        user_long_t;
+typedef u_int32_t              user_ulong_t;
+typedef int32_t                        user_time_t;
+#define USER_ADDR_NULL ((user_addr_t) 0)
+#define CAST_USER_ADDR_T(a_ptr)   ((user_addr_t)(a_ptr))
+
+#ifndef __offsetof
 #define __offsetof(type, field) ((size_t)(&((type *)0)->field))
+#endif
 
 #endif /* __ASSEMBLER__ */
 #endif /* _MACHTYPES_H_ */