xnu-792.25.20.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 a573941ef4a0970dc4dc2c1899b918e637294151..2d441d5024058f37a5aef7fdd4e424a96f5e3f2c 100644 (file)
--- a/osfmk/machine/cpu_capabilities.h
+++ b/osfmk/machine/cpu_capabilities.h
@@ -19,12 +19,12 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

+#ifdef PRIVATE

 
 #ifndef _MACHINE_CPU_CAPABILITIES_H
 #define _MACHINE_CPU_CAPABILITIES_H
 
 
 #ifndef _MACHINE_CPU_CAPABILITIES_H
 #define _MACHINE_CPU_CAPABILITIES_H
 

-#ifdef __APPLE_API_PRIVATE
-
+#ifdef KERNEL_PRIVATE

 #if defined (__ppc__)
 #include "ppc/cpu_capabilities.h"
 #elif defined (__i386__)
 #if defined (__ppc__)
 #include "ppc/cpu_capabilities.h"
 #elif defined (__i386__)


@@ -33,5 +33,15 @@
 #error architecture not supported
 #endif
 
 #error architecture not supported
 #endif
 

-#endif /* __APPLE_API_PRIVATE */
+#else /* !KERNEL_PRIVATE -- System Framework header */
+#if defined (__ppc__) || defined(__ppc64__)
+#include <System/ppc/cpu_capabilities.h>
+#elif 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 /* _MACHINE_CPU_CAPABILITIES_H */

+#endif /* PRIVATE */