Changeset 55319 in vbox

Timestamp:

Apr 17, 2015 8:31:44 AM (10 years ago)

Author:

vboxsync

Message:

forward-ported r98914, r98916 from 4.3 to trunk (LogRel and build fix)

Location:

trunk

Files:

• . (modified) (1 prop)
• include/iprt/asm-amd64-x86.h (modified) (2 diffs)
• src/VBox (modified) (1 prop)
• src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (1 diff)

trunk/include/iprt/asm-amd64-x86.h

@@ -3093 +3093 @@
 }
 
+#if !defined(_MSC_VER) || !defined(RT_ARCH_AMD64)
 
 /*
@@ -3133 +3134 @@
 }
 
+#endif /* !_MSC_VER) || !RT_ARCH_AMD64 */
+
 /** @} */
 #endif

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

@@ -279 +279 @@
             {
                 if (vboxdrvDarwinCpuHasSMAP())
+                {
+                    LogRel(("disabling SMAP for VBoxDrvDarwinIOCtl\n"));
                     g_DevCW.d_ioctl = VBoxDrvDarwinIOCtlSMAP;
+                }
+
                 /*
                  * Registering ourselves as a character device.