xnu-2422.1.72.tar.gz

[apple/xnu.git] / osfmk / machine / cpu_capabilities.h

diff --git a/osfmk/machine/cpu_capabilities.h b/osfmk/machine/cpu_capabilities.h
index 52ec0f320aca2d6daa978151d49ae49c99626201..a722dc93f1fe265005833df7e59f5d2c2fc3be51 100644 (file)
--- a/osfmk/machine/cpu_capabilities.h
+++ b/osfmk/machine/cpu_capabilities.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple 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
- * 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
@@ -20,21 +23,27 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+#ifdef PRIVATE
 
 #ifndef _MACHINE_CPU_CAPABILITIES_H
 #define _MACHINE_CPU_CAPABILITIES_H
 
-#ifdef __APPLE_API_PRIVATE
-
-#if defined (__ppc__)
-#include "ppc/cpu_capabilities.h"
-#elif defined (__i386__)
+#ifdef KERNEL_PRIVATE
+#if defined (__i386__) || defined (__x86_64__)
 #include "i386/cpu_capabilities.h"
 #else
 #error architecture not supported
 #endif
 
-#endif /* __APPLE_API_PRIVATE */
+#else /* !KERNEL_PRIVATE -- System Framework header */
+#if defined (__i386__) || defined(__x86_64__)
+#include <System/i386/cpu_capabilities.h>
+#else
+#error architecture not supported
+#endif
+#endif /* KERNEL_PRIVATE */
+
 #endif /* _MACHINE_CPU_CAPABILITIES_H */
+#endif /* PRIVATE */