xnu-792.6.61.tar.gz

[apple/xnu.git] / osfmk / mach / semaphore.h

diff --git a/osfmk/mach/semaphore.h b/osfmk/mach/semaphore.h
index fe21aa9fb8883ff6d31df78d61b9588bce54637b..e5241b51ff6c60b2cc4b542eee0a5fa9aa2c8211 100644 (file)
--- a/osfmk/mach/semaphore.h
+++ b/osfmk/mach/semaphore.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -28,27 +28,6 @@
 #include <mach/kern_return.h>
 #include <mach/sync_policy.h>
 
 #include <mach/kern_return.h>
 #include <mach/sync_policy.h>
 

-#define SEMAPHORE_OPTION_NONE          0x00000000
-
-#define SEMAPHORE_SIGNAL               0x00000001
-#define SEMAPHORE_WAIT                 0x00000002
-#define SEMAPHORE_WAIT_ON_SIGNAL       0x00000008
-
-#define SEMAPHORE_SIGNAL_TIMEOUT       0x00000010
-#define SEMAPHORE_SIGNAL_ALL           0x00000020
-#define SEMAPHORE_SIGNAL_INTERRUPT     0x00000040      /* libmach implements */
-#define SEMAPHORE_SIGNAL_PREPOST       0x00000080
-
-#define SEMAPHORE_WAIT_TIMEOUT         0x00000100
-#define SEMAPHORE_WAIT_INTERRUPT       0x00000400      /* libmach implements */
-
-#define SEMAPHORE_TIMEOUT_NOBLOCK      0x00100000
-#define SEMAPHORE_TIMEOUT_RELATIVE     0x00200000
-
-#define SEMAPHORE_USE_SAVED_RESULT     0x01000000      /* internal use only */
-#define SEMAPHORE_SIGNAL_RELEASE       0x02000000      /* internal use only */
-
-

 /*
  *     Forward Declarations
  *
 /*
  *     Forward Declarations
  *


@@ -64,10 +43,13 @@
  *                                       semaphore_t semaphore);
  */
 
  *                                       semaphore_t semaphore);
  */
 

+#include <sys/cdefs.h>
+__BEGIN_DECLS
+

 extern kern_return_t   semaphore_signal        (semaphore_t semaphore);
 extern kern_return_t   semaphore_signal_all    (semaphore_t semaphore);
 extern kern_return_t   semaphore_signal_thread (semaphore_t semaphore,
 extern kern_return_t   semaphore_signal        (semaphore_t semaphore);
 extern kern_return_t   semaphore_signal_all    (semaphore_t semaphore);
 extern kern_return_t   semaphore_signal_thread (semaphore_t semaphore,

-                                                thread_act_t thread_act);
+                                                 thread_t thread);

 
 extern kern_return_t   semaphore_wait          (semaphore_t semaphore);
 extern kern_return_t   semaphore_timedwait     (semaphore_t semaphore, 
 
 extern kern_return_t   semaphore_wait          (semaphore_t semaphore);
 extern kern_return_t   semaphore_timedwait     (semaphore_t semaphore, 


@@ -79,11 +61,30 @@ extern  kern_return_t   semaphore_wait_signal   (semaphore_t wait_semaphore,
 extern  kern_return_t semaphore_timedwait_signal(semaphore_t wait_semaphore,
                                                  semaphore_t signal_semaphore,
                                                  mach_timespec_t wait_time);
 extern  kern_return_t semaphore_timedwait_signal(semaphore_t wait_semaphore,
                                                  semaphore_t signal_semaphore,
                                                  mach_timespec_t wait_time);

+__END_DECLS

 
 

-extern  kern_return_t  semaphore_operator      (int options,
-                                                semaphore_t wait_semaphore,
-                                                semaphore_t signal_semaphore,
-                                                thread_act_t thread,
-                                                mach_timespec_t wait_time);
+#ifdef PRIVATE
+
+#define SEMAPHORE_OPTION_NONE          0x00000000
+
+#define SEMAPHORE_SIGNAL               0x00000001
+#define SEMAPHORE_WAIT                 0x00000002
+#define SEMAPHORE_WAIT_ON_SIGNAL       0x00000008
+
+#define SEMAPHORE_SIGNAL_TIMEOUT       0x00000010
+#define SEMAPHORE_SIGNAL_ALL           0x00000020
+#define SEMAPHORE_SIGNAL_INTERRUPT     0x00000040      /* libmach implements */
+#define SEMAPHORE_SIGNAL_PREPOST       0x00000080
+
+#define SEMAPHORE_WAIT_TIMEOUT         0x00000100
+#define SEMAPHORE_WAIT_INTERRUPT       0x00000400      /* libmach implements */
+
+#define SEMAPHORE_TIMEOUT_NOBLOCK      0x00100000
+#define SEMAPHORE_TIMEOUT_RELATIVE     0x00200000
+
+#define SEMAPHORE_USE_SAVED_RESULT     0x01000000      /* internal use only */
+#define SEMAPHORE_SIGNAL_RELEASE       0x02000000      /* internal use only */
+
+#endif /* PRIVATE */

 
 

-#endif /* _MACH_SEMAPHORE_H_ */
+#endif /* _MACH_SEMAPHORE_H_ */