xnu-792.6.76.tar.gz

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

diff --git a/osfmk/mach/semaphore.h b/osfmk/mach/semaphore.h
index 8ac6f1963ba698feb8404d0087d67809d45b108e..e5241b51ff6c60b2cc4b542eee0a5fa9aa2c8211 100644 (file)
--- a/osfmk/mach/semaphore.h
+++ b/osfmk/mach/semaphore.h
@@ -1,24 +1,21 @@
 /*
 /*

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

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

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -46,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, 


@@ -61,11 +61,9 @@ 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

 
 

-#include <sys/appleapiopts.h>
-
-#ifdef  __APPLE_API_PRIVATE
-#ifdef  __APPLE_API_EVOLVING
+#ifdef PRIVATE

 
 #define SEMAPHORE_OPTION_NONE          0x00000000
 
 
 #define SEMAPHORE_OPTION_NONE          0x00000000
 


@@ -87,14 +85,6 @@ extern  kern_return_t semaphore_timedwait_signal(semaphore_t wait_semaphore,
 #define SEMAPHORE_USE_SAVED_RESULT     0x01000000      /* internal use only */
 #define SEMAPHORE_SIGNAL_RELEASE       0x02000000      /* internal use only */
 
 #define SEMAPHORE_USE_SAVED_RESULT     0x01000000      /* internal use only */
 #define SEMAPHORE_SIGNAL_RELEASE       0x02000000      /* internal use only */
 

-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);
-
-#endif /* __APPLE_API_EVOLVING */
-
-#endif /* __APPLE_API_PRIVATE */
+#endif /* PRIVATE */

 
 

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