xnu-4903.241.1.tar.gz

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

diff --git a/osfmk/mach/boolean.h b/osfmk/mach/boolean.h
index 4b41b4462e116a9d6f061d54e22e00d055170ac5..641c3962d9feca3415a2deb3865405e9745961f4 100644 (file)
--- a/osfmk/mach/boolean.h
+++ b/osfmk/mach/boolean.h
@@ -1,87 +1,33 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * 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.
+ * 
+ * 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@

  */
 /*
  * @OSF_COPYRIGHT@
  */
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/*
- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:31  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:25:45  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.2.6.1  1994/09/23  02:34:07  ezf
- *     change marker to not FREE
- *     [1994/09/22  21:39:00  ezf]
- *
- * Revision 1.2.2.3  1993/08/03  18:22:11  gm
- *     CR9598: Remove unneeded EXPORT_BOOLEAN and KERNEL ifdefs.  Move
- *     the code inside the include protection and remove the boolean_t
- *     casts from TRUE and FALSE.
- *     [1993/08/02  17:49:29  gm]
- * 
- * Revision 1.2.2.2  1993/06/09  02:39:27  gm
- *     Added to OSF/1 R1.3 from NMK15.0.
- *     [1993/06/02  21:15:31  jeffc]
- * 
- * Revision 1.2  1993/04/19  16:31:43  devrcs
- *     ansi C conformance changes
- *     [1993/02/02  18:52:46  david]
- * 
- * Revision 1.1  1992/09/30  02:30:33  robert
- *     Initial revision
- * 
- * $EndLog$
- */
-/* CMU_HIST */
-/*
- * Revision 2.3  91/05/14  16:51:06  mrt
- *     Correcting copyright
- * 
- * Revision 2.2  91/02/05  17:31:38  mrt
- *     Changed to new Mach copyright
- *     [91/02/01  17:16:36  mrt]
- * 
- * Revision 2.1  89/08/03  15:59:35  rwd
- * Created.
- * 
- * Revision 2.4  89/02/25  18:12:08  gm0w
- *     Changes for cleanup.
- * 
- * Revision 2.3  89/02/07  00:51:34  mwyoung
- * Relocated from sys/boolean.h
- * 
- * Revision 2.2  88/08/24  02:23:06  mwyoung
- *     Adjusted include file references.
- *     [88/08/17  02:09:46  mwyoung]
- * 
- *
- * 18-Nov-87  Avadis Tevanian (avie) at Carnegie-Mellon University
- *     Header file fixup, purge history.
- *
- */
-/* CMU_ENDHIST */

 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University


@@ -116,8 +62,8 @@
  *
  */
 
  *
  */
 

-#ifndef        BOOLEAN_H_
-#define        BOOLEAN_H_
+#ifndef        _MACH_BOOLEAN_H_
+#define        _MACH_BOOLEAN_H_

 
 /*
  *     Pick up "boolean_t" type definition
 
 /*
  *     Pick up "boolean_t" type definition


@@ -128,12 +74,9 @@
 #endif /* ASSEMBLER */
 
 /*
 #endif /* ASSEMBLER */
 
 /*

- *     Define TRUE and FALSE, only if they haven't been before,
- *     and not if they're explicitly refused.
+ *     Define TRUE and FALSE if not defined.

  */
 
  */
 

-#ifndef        NOBOOL
-

 #ifndef        TRUE
 #define TRUE   1
 #endif /* TRUE */
 #ifndef        TRUE
 #define TRUE   1
 #endif /* TRUE */


@@ -142,6 +85,4 @@
 #define FALSE  0
 #endif /* FALSE */
 
 #define FALSE  0
 #endif /* FALSE */
 

-#endif /* !defined(NOBOOL) */
-
-#endif /* BOOLEAN_H_ */
+#endif /* _MACH_BOOLEAN_H_ */