xnu-1699.22.81.tar.gz

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

diff --git a/bsd/sys/semaphore.h b/bsd/sys/semaphore.h
index 9da7e490312b99d56ac86da0c9b2bac754acfc06..977655231594a152a77e37cf3292da2a907f9ab8 100644 (file)
--- a/bsd/sys/semaphore.h
+++ b/bsd/sys/semaphore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -41,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>
@@ -51,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_ */