xnu-344.49.tar.gz

[apple/xnu.git] / osfmk / kern / sync_lock.h

diff --git a/osfmk/kern/sync_lock.h b/osfmk/kern/sync_lock.h
index 040594f8cdaf49ee6301f2d2f2ee0705bfe92b5d..70a142bd00fab85643beed56216dfb60ce7ad13f 100644 (file)
--- a/osfmk/kern/sync_lock.h
+++ b/osfmk/kern/sync_lock.h
@@ -3,19 +3,22 @@
  *
  * @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@
  */
@@ -35,7 +38,11 @@
 
 #include <mach/mach_types.h>
 
-#ifdef MACH_KERNEL_PRIVATE
+#include <sys/appleapiopts.h>
+
+#ifdef __APPLE_API_PRIVATE
+
+#ifdef MACH_KERNEL_PRIVATE
 
 #include <kern/wait_queue.h>
 #include <kern/macro_help.h>
@@ -81,9 +88,6 @@ typedef struct lock_set {
 #define ULOCK_FREE     0
 #define ULOCK_HELD     1
 
-#define LOCK_OPERATION_ABORTED(th)   ((th)->wait_link.prev != (queue_entry_t) 0)
-#define LOCK_OPERATION_COMPLETE(th)  ((th)->wait_link.prev  = (queue_entry_t) 0)
-
 /*
  *  Data structure internal lock macros
  */
@@ -100,7 +104,13 @@ typedef struct lock_set {
 
 extern void lock_set_init(void);
 
-#endif /* MACH_KERNEL_PRIVATE */
+extern kern_return_t   lock_release_internal   (ulock_t ulock,
+                                                thread_act_t thr_act);
+
+#endif /* MACH_KERNEL_PRIVATE */
+
+#endif /* __APPLE_API_PRIVATE */
+
 
 /*
  *     Forward Declarations
@@ -129,9 +139,6 @@ extern      kern_return_t   lock_make_stable        (lock_set_t lock_set,
 extern  kern_return_t  lock_make_unstable      (ulock_t ulock,
                                                 thread_act_t thr_act);
 
-extern kern_return_t   lock_release_internal   (ulock_t ulock,
-                                                thread_act_t thr_act);
-
 extern kern_return_t   lock_handoff            (lock_set_t lock_set,
                                                 int lock_id);