Changeset 45459 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

Timestamp:

Apr 10, 2013 3:24:23 PM (12 years ago)

Author:

vboxsync

Message:

BUGZ:4686 OS X guest: VBoxGuest device driver + VBoxService and VBoxControl now work.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -48 +48 @@
 #  include <net/if_arp.h>
 # endif
-# ifdef RT_OS_FREEBSD
+# if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
 #  include <ifaddrs.h> /* getifaddrs, freeifaddrs */
 #  include <net/if_dl.h> /* LLADDR */
@@ -450 +450 @@
            && RT_SUCCESS(rc))
     {
+#ifdef RT_OS_DARWIN /* No ut_user->ut_session on Darwin */
+        VBoxServiceVerbose(4, "Found entry \"%s\" (type: %d, PID: %RU32)\n",
+                           ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
+#else
         VBoxServiceVerbose(4, "Found entry \"%s\" (type: %d, PID: %RU32, session: %RU32)\n",
                            ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid, ut_user->ut_session);
+#endif
         if (cUsersInList > cListSize)
         {
@@ -908 +913 @@
     return VERR_NOT_IMPLEMENTED;
 
-#elif defined(RT_OS_FREEBSD)
+#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     struct ifaddrs *pIfHead = NULL;