Changeset 57252 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Aug 8, 2015 11:21:45 PM (9 years ago)

Author:

vboxsync

Message:

SUPDrv,VBoxNetFlt,VBoxNetAdp: Include the-darwin-kernel.h to avoid duplicating workarounds and EFLAGS.AC macros.

File:

• trunk/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h

@@ -28 +28 @@
 #define ___the_darwin_kernel_h
 
-/* Problematic header(s) containing conflicts with IPRT  first. */
+/* Problematic header(s) containing conflicts with IPRT first. (FreeBSD has fixed these ages ago.) */
 #define __STDC_CONSTANT_MACROS
 #define __STDC_LIMIT_MACROS
@@ -38 +38 @@
 #undef PAGE_SIZE
 #undef PAGE_SHIFT
+#undef PVM
+
 
 /* Include the IPRT definitions of the conflicting #defines & typedefs. */
@@ -73 +75 @@
 #include <sys/fcntl.h>
 #include <IOKit/IOTypes.h>
-#include <IOKit/IOLib.h>
+#include <IOKit/IOLib.h> /* Note! Has Assert down as a function. */
 #include <IOKit/IOMemoryDescriptor.h>
 #include <IOKit/IOBufferMemoryDescriptor.h>