xnu-792.10.96.tar.gz

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

diff --git a/osfmk/mach/mach_interface.h b/osfmk/mach/mach_interface.h
index 6b0a54fb729dee838bb22cb2c7699c8c895e2161..91b4b2bacd11013047a89395acaa2bb8c0ce6fb3 100644 (file)
--- a/osfmk/mach/mach_interface.h
+++ b/osfmk/mach/mach_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -19,17 +19,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (C) Apple Computer 1998
- * ALL Rights Reserved
- */
-/*
- * This file represents the interfaces that used to come
- * from creating the user headers from the mach.defs file.
- * Because mach.defs was decomposed, this file now just
- * wraps up all the new interface headers generated from
- * each of the new .defs resulting from that decomposition.
- */
+
 #ifndef        _MACH_INTERFACE_H_
 #define _MACH_INTERFACE_H_
 
@@ -43,10 +33,6 @@
 #include <mach/lock_set.h>
 #include <mach/mach_host.h>
 #include <mach/mach_port.h>
-#include <mach/memory_object_server.h>
-#include <mach/memory_object_default_server.h>
-#include <mach/memory_object_control.h>
-#include <mach/memory_object_name.h>
 #include <mach/notify_server.h>
 #include <mach/processor.h>
 #include <mach/processor_set.h>
@@ -55,6 +41,15 @@
 #include <mach/thread_act.h>
 #include <mach/vm_map.h>
 
-#endif /* _MACH_INTERFACE_H_ */
-
+#ifdef XNU_KERNEL_PRIVATE
+/*
+ * Raw EMMI interfaces are private to xnu
+ * and subject to change.
+ */
+#include <mach/memory_object_default_server.h>
+#include <mach/memory_object_control.h>
+#include <mach/memory_object_name.h>
+#include <mach/upl.h>
+#endif
 
+#endif /* _MACH_INTERFACE_H_ */