xnu-517.3.15.tar.gz

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

diff --git a/bsd/sys/types.h b/bsd/sys/types.h
index a2cb5928d892fd5e9f6a8f15ce52835ec3ac2d20..50c8ec276b1c7c2647edbda1a667f38277bc6cf2 100644 (file)
--- a/bsd/sys/types.h
+++ b/bsd/sys/types.h
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -63,6 +66,8 @@
 #ifndef _SYS_TYPES_H_
 #define        _SYS_TYPES_H_
 
+#include <sys/appleapiopts.h>
+
 #ifndef __ASSEMBLER__
 #include <sys/cdefs.h>
 
@@ -90,6 +95,8 @@ typedef       int32_t         daddr_t;        /* disk address */
 typedef        int32_t         dev_t;          /* device number */
 typedef        u_int32_t       fixpt_t;        /* fixed point number */
 typedef        u_int32_t       gid_t;          /* group id */
+typedef        u_int32_t       in_addr_t;      /* base type for internet address */
+typedef        u_int16_t       in_port_t;
 typedef        u_int32_t       ino_t;          /* inode number */
 typedef        long            key_t;          /* IPC key (for Sys V IPC) */
 typedef        u_int16_t       mode_t;         /* permissions */
@@ -100,7 +107,7 @@ typedef quad_t              rlim_t;         /* resource limit */
 typedef        int32_t         segsz_t;        /* segment size */
 typedef        int32_t         swblk_t;        /* swap offset */
 typedef        u_int32_t       uid_t;          /* user id */
-
+typedef u_int32_t      useconds_t;     /* microseconds (unsigned) */
 
 #ifndef _POSIX_SOURCE
 /* Major, minor numbers, dev_t's. */
@@ -192,6 +199,8 @@ struct _pthread_handler_rec
 #define __PTHREAD_CONDATTR_SIZE__  4
 #define __PTHREAD_COND_SIZE__      24
 #define __PTHREAD_ONCE_SIZE__      4
+#define __PTHREAD_RWLOCK_SIZE__    124
+#define __PTHREAD_RWLOCKATTR_SIZE__ 12
 
 
 typedef struct _opaque_pthread_t { long sig; struct _pthread_handler_rec  *cleanup_stack; char opaque[__PTHREAD_SIZE__];} *pthread_t;
@@ -206,6 +215,10 @@ typedef struct _opaque_pthread_condattr_t { long sig; char opaque[__PTHREAD_COND
 
 typedef struct _opaque_pthread_cond_t { long sig;  char opaque[__PTHREAD_COND_SIZE__]; } pthread_cond_t;
 
+typedef struct _opaque_pthread_rwlockattr_t { long sig; char opaque[__PTHREAD_RWLOCKATTR_SIZE__]; } pthread_rwlockattr_t;
+
+typedef struct _opaque_pthread_rwlock_t { long sig;  char opaque[__PTHREAD_RWLOCK_SIZE__]; } pthread_rwlock_t;
+
 typedef struct { long sig; char opaque[__PTHREAD_ONCE_SIZE__]; } pthread_once_t;
 
 #endif /* __POSIX_LIB__ */