xnu-792.18.15.tar.gz

[apple/xnu.git] / iokit / IOKit / IOTypes.h

diff --git a/iokit/IOKit/IOTypes.h b/iokit/IOKit/IOTypes.h
index d503e6a4730e64683db54670a90d06e569bd9d89..294f325b34df229b3fbd6b7f09db0fc26783ad1a 100644 (file)
--- a/iokit/IOKit/IOTypes.h
+++ b/iokit/IOKit/IOTypes.h
@@ -62,20 +62,9 @@ extern "C" {
 #ifndef __MACTYPES__   /* CF MacTypes.h */
 #ifndef __TYPES__      /* guess... Mac Types.h */
 
+#include <stdbool.h>
 #include <libkern/OSTypes.h>
 
-#ifndef __cplusplus
-#if !TYPE_BOOL
-#ifdef KERNEL
-typedef int    bool;
-enum {
-    false      = 0,
-    true       = 1
-};
-#endif
-#endif
-#endif
-
 #endif /* __TYPES__ */
 #endif /* __MACTYPES__ */
 
@@ -113,12 +102,23 @@ struct IOVirtualRange
     IOVirtualAddress   address;
     IOByteCount                length;
 };
+struct IOAddressRange
+{
+    mach_vm_address_t  address;
+    mach_vm_size_t     length;
+};
 #else
 typedef struct 
 {
     IOVirtualAddress   address;
     IOByteCount                length;
 } IOVirtualRange;
+
+struct IOAddressRange
+{
+    mach_vm_address_t  address;
+    mach_vm_size_t     length;
+};
 #endif
 
 /*