xnu-4903.241.1.tar.gz

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

diff --git a/osfmk/mach/i386/boolean.h b/osfmk/mach/i386/boolean.h
index 92398a34f316bd9c9f6fdd8e43bab52c3ead2f9f..100f7e7b51d05987dcbbb99696fd2e3fe627d09a 100644 (file)
--- a/osfmk/mach/i386/boolean.h
+++ b/osfmk/mach/i386/boolean.h
@@ -1,16 +1,19 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
  * 
  * 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.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,59 +23,11 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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:47  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.2.6.1  1994/09/23  02:36:44  ezf
- *     change marker to not FREE
- *     [1994/09/22  21:39:49  ezf]
- *
- * Revision 1.2.2.2  1993/06/09  02:40:19  gm
- *     Added to OSF/1 R1.3 from NMK15.0.
- *     [1993/06/02  21:16:03  jeffc]
- * 
- * Revision 1.2  1993/04/19  16:33:37  devrcs
- *     ansi C conformance changes
- *     [1993/02/02  18:55:53  david]
- * 
- * Revision 1.1  1992/09/30  02:30:40  robert
- *     Initial revision
- * 
- * $EndLog$
- */
-/* CMU_HIST */
-/*
- * Revision 2.4  91/05/14  16:51:56  mrt
- *     Correcting copyright
- * 
- * Revision 2.3  91/02/05  17:32:04  mrt
- *     Changed to new Mach copyright
- *     [91/02/01  17:09:33  mrt]
- * 
- * Revision 2.2  90/05/03  15:47:26  dbg
- *     First checkin.
- * 
- * Revision 1.3  89/03/09  20:19:36  rpd
- *     More cleanup.
- * 
- * Revision 1.2  89/02/26  13:00:41  gm0w
- *     Changes for cleanup.
- * 
- * 24-Sep-86  Michael Young (mwyoung) at Carnegie-Mellon University
- *     Created.
- */
-/* CMU_ENDHIST */

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


@@ -110,6 +65,10 @@
 #ifndef        _MACH_I386_BOOLEAN_H_
 #define _MACH_I386_BOOLEAN_H_
 
 #ifndef        _MACH_I386_BOOLEAN_H_
 #define _MACH_I386_BOOLEAN_H_
 

+#if defined(__x86_64__) && !defined(KERNEL)
+typedef unsigned int   boolean_t;
+#else

 typedef int            boolean_t;
 typedef int            boolean_t;

+#endif

 
 #endif /* _MACH_I386_BOOLEAN_H_ */
 
 #endif /* _MACH_I386_BOOLEAN_H_ */