xnu-1228.5.18.tar.gz

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

diff --git a/bsd/i386/types.h b/bsd/i386/types.h
index daa667b0deffa6f8a5507b2c155b9884afaaf547..d02ab0bb2e4870db96963336fe3a1dc1b9206ba3 100644 (file)
--- a/bsd/i386/types.h
+++ b/bsd/i386/types.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright 1995 NeXT Computer, Inc. All rights reserved.
@@ -89,7 +94,11 @@ typedef      long long               int64_t;
 #endif
 typedef        unsigned long long      u_int64_t;
 
+#if __LP64__
+typedef int64_t                        register_t;
+#else
 typedef int32_t                        register_t;
+#endif
 
 #ifndef _INTPTR_T
 #define _INTPTR_T
@@ -100,17 +109,20 @@ typedef __darwin_intptr_t intptr_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;
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+/* These types are used for reserving the largest possible size. */
+typedef u_int64_t              user_addr_t;    
+typedef u_int64_t              user_size_t;    
+typedef int64_t                        user_ssize_t;
+typedef int64_t                        user_long_t;
+typedef u_int64_t              user_ulong_t;
+typedef int64_t                        user_time_t;
 #define USER_ADDR_NULL ((user_addr_t) 0)
-#define CAST_USER_ADDR_T(a_ptr)   ((user_addr_t)(a_ptr))
+#define CAST_USER_ADDR_T(a_ptr)   ((user_addr_t)((uintptr_t)(a_ptr)))
+#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/* This defines the size of syscall arguments after copying into the kernel: */
+typedef u_int64_t              syscall_arg_t;
 
 #ifndef __offsetof
 #define __offsetof(type, field) ((size_t)(&((type *)0)->field))