xnu-2422.90.20.tar.gz

[apple/xnu.git] / bsd / kern / ast.h

diff --git a/bsd/kern/ast.h b/bsd/kern/ast.h
index f2b6aa07e7b255e9855ab3397d1623f220191cc9..a8dc219324d46090f7ed65ccba6fed8997a456ff 100644 (file)
--- a/bsd/kern/ast.h
+++ b/bsd/kern/ast.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 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,
  * 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@

  */
 /* CMU_HIST */
 
  */
 /* CMU_HIST */
 


@@ -28,18 +34,10 @@
 #ifndef _KERN_AST_H_
 #define _KERN_AST_H_
 
 #ifndef _KERN_AST_H_
 #define _KERN_AST_H_
 

-#include <kern/thread_act.h>
-
-#ifdef BSD_USE_APC
-
-extern thread_apc_handler_t bsd_ast;
-
-#else /* !BSD_USE_APC */
+#include <kern/thread.h>

 
 extern void astbsd_on(void);
 
 extern void astbsd_on(void);

-extern void act_set_astbsd(thread_act_t);
-extern void bsd_ast(thread_act_t);
-
-#endif /* !BSD_USE_APC */
+extern void act_set_astbsd(thread_t);
+extern void bsd_ast(thread_t);

 
 #endif  /* _KERN_AST_H_ */
 
 #endif  /* _KERN_AST_H_ */