Support

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102006

Message:

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

File:

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

-              r57244
+              r57252
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_SUP_DRV
+/*
+ * Deal with conflicts first.
+ * PVM - BSD mess, that FreeBSD has correct a long time ago.
+ * iprt/types.h before sys/param.h - prevents UINT32_C and friends.
+ */
+#include <iprt/types.h>
+#include <sys/param.h>
+#undef PVM
+#include <IOKit/IOLib.h> /* Assert as function */
+#include "../../../Runtime/r0drv/darwin/the-darwin-kernel.h"
 #include "../SUPDrvInternal.h"
 …
 RT_C_DECLS_END
 #endif
-/* The following macros are duplicated in the-darwin-kernel.h. */
-#define IPRT_DARWIN_SAVE_EFL_AC()           RTCCUINTREG const fSavedEfl = ASMGetFlags();
-#define IPRT_DARWIN_RESTORE_EFL_AC()        ASMSetFlags(fSavedEfl)
-#define IPRT_DARWIN_RESTORE_EFL_ONLY_AC()   ASMChangeFlags(~X86_EFL_AC, fSavedEfl & X86_EFL_AC)
 /* Temporary debugging - very temporary... */

Note: See TracChangeset for help on using the changeset viewer.