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 b3c08099b89049252027c1035135e0e97f24ce42..ab1c10837b68977b0a875e4a81d67c5fbc55936b 100644 (file)
--- a/bsd/i386/types.h
+++ b/bsd/i386/types.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -64,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_ */