Changeset 68579 in vbox

Timestamp:

Aug 31, 2017 12:11:06 PM (8 years ago)

Author:

vboxsync

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

117796

Message:

merging vbglioc r117757: Build fixes for FreeBSD 10.3.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -327 +327 @@
 } VBGLIOCDRIVERVERSIONINFO, RT_FAR *PVBGLIOCDRIVERVERSIONINFO;
 AssertCompileSize(VBGLIOCDRIVERVERSIONINFO, 24 + 20);
-#ifndef RT_OS_OS2 /* figure this one out... */
+#ifndef __GNUC__ /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */
 AssertCompile(VBGL_IOCTL_DRIVER_VERSION_INFO_SIZE_IN == 24 + 16);
 #endif
@@ -404 +404 @@
 } VBGLIOCHGCMCONNECT, RT_FAR *PVBGLIOCHGCMCONNECT;
 AssertCompileSize(VBGLIOCHGCMCONNECT, 24 + 132);
-#ifndef RT_OS_OS2 /* figure this one out... */
+#ifndef __GNUC__ /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */
 AssertCompile(VBGL_IOCTL_HGCM_CONNECT_SIZE_OUT == 24 + 4);
 #endif
@@ -1043 +1043 @@
 } VBGLIOCIDCCONNECT, RT_FAR *PVBGLIOCIDCCONNECT;
 AssertCompileSize(VBGLIOCIDCCONNECT, 24 + 16 + (ARCH_BITS == 64 ? 8 : 4) * 2);
-#ifndef RT_OS_OS2 /* figure this one out... */
+#ifndef __GNUC__ /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */
 AssertCompile(VBGL_IOCTL_IDC_CONNECT_SIZE_IN == 24 + 16);
 #endif

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -429 +429 @@
     if (g_File != NIL_RTFILE)
     {
-        if (RT_LIKELY(ioctl((int)g_File, uFunction, pHdr) >= 0))
+        if (RT_LIKELY(ioctl((int)(intptr_t)g_File, uFunction, pHdr) >= 0))
             return VINF_SUCCESS;
         return RTErrConvertFromErrno(errno);