Changeset 92621 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 29, 2021 10:05:23 AM (3 years ago)

Author:

vboxsync

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

148513

Message:

VBoxGuest/darwin,IPRT/r0drv/darwin: Clang 13 build fixes.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp

@@ -62 +62 @@
 #include <sys/proc.h>
 #include <sys/kauth.h>
+#define _OS_OSUNSERIALIZE_H /* HACK ALERT! Block importing OSUnserialized.h as it causes compilation trouble with
+                               newer clang versions and the 10.15 SDK, and we really don't need it. Sample error:
+                               libkern/c++/OSUnserialize.h:72:2: error: use of OSPtr outside of a return type [-Werror,-Wossharedptr-misuse] */
 #include <IOKit/IOService.h>
 #include <IOKit/IOUserClient.h>
@@ -86 +89 @@
                                             proc_selfname(a_Name, VBOX_PROC_SELFNAME_LEN)
 /** @} */
+
+#ifndef minor
+/* The inlined C++ function version minor() takes the wrong parameter
+   type, uint32_t instead of dev_t.  This kludge works around that. */
+# define minor(x) minor((uint32_t)(x))
+#endif
 
 
@@ -313 +322 @@
         {
             /** @todo limit /dev/vboxguest access. */
-            g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
+            g_hDevFsDeviceSys = devfs_make_node(makedev((uint32_t)g_iMajorDeviceNo, 0), DEVFS_CHAR,
                                                 UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_SYS);
             if (g_hDevFsDeviceSys != NULL)
@@ -320 +329 @@
                  * And a all-user device.
                  */
-                g_hDevFsDeviceUsr = devfs_make_node(makedev(g_iMajorDeviceNo, 1), DEVFS_CHAR,
+                g_hDevFsDeviceUsr = devfs_make_node(makedev((uint32_t)g_iMajorDeviceNo, 1), DEVFS_CHAR,
                                                     UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_USR);
                 if (g_hDevFsDeviceUsr != NULL)
@@ -499 +508 @@
     RT_NOREF(Dev, fFlags);
     const bool          fUnrestricted = minor(Dev) == 0;
-    const RTPROCESS     Process = proc_pid(pProcess);
+    const RTPROCESS     Process = (RTPROCESS)proc_pid(pProcess);
     const unsigned      iHash = SESSION_HASH(Process);
     PVBOXGUESTSESSION   pSession;
@@ -897 +906 @@
                             {
                                 pvMMIOBase = (void *)m_pMap->getVirtualAddress();
-                                cbMMIO     = m_pMap->getLength();
+                                cbMMIO     = (uint32_t)m_pMap->getLength();
                             }