xnu-1228.12.14.tar.gz

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

diff --git a/bsd/sys/semaphore.h b/bsd/sys/semaphore.h
index 10ba6378b0b16d1a871c0a0af67cbcd9e9a3cca5..977655231594a152a77e37cf3292da2a907f9ab8 100644 (file)
--- a/bsd/sys/semaphore.h
+++ b/bsd/sys/semaphore.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 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@
  * 
- * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*     @(#)semaphore.h 1.0     2/29/00         */
 
@@ -35,9 +41,10 @@
 #define _SYS_SEMAPHORE_H_
 
 typedef int sem_t;
+
 /* this should go in limits.h> */
 #define SEM_VALUE_MAX 32767
-#define SEM_FAILED -1
+#define SEM_FAILED ((sem_t *)-1)
 
 #ifndef KERNEL
 #include <sys/cdefs.h>
@@ -45,17 +52,18 @@ typedef int sem_t;
 __BEGIN_DECLS
 int sem_close(sem_t *);
 int sem_destroy(sem_t *);
-int sem_getvalue(sem_t *, int *);
+int sem_getvalue(sem_t * __restrict, int * __restrict);
 int sem_init(sem_t *, int, unsigned int);
 sem_t * sem_open(const char *, int, ...);
 int sem_post(sem_t *);
 int sem_trywait(sem_t *);
 int sem_unlink(const char *);
-int sem_wait(sem_t *);
+int sem_wait(sem_t *) __DARWIN_ALIAS_C(sem_wait);
 __END_DECLS
 
 #else  /* KERNEL */
-void psem_cache_init(void);
+void psem_lock_init(void);
+void psem_cache_init(void) __attribute__((section("__TEXT, initcode")));
 #endif /* KERNEL */
 
 #endif /* _SYS_SEMAPHORE_H_ */