Changeset 68616 in vbox

Timestamp:

Sep 3, 2017 3:51:50 PM (8 years ago)

Author:

vboxsync

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

117843

Message:

VBoxGuest.h,VMMDev.h: Watcom (C++) adjustments.

Location:

trunk/include/VBox

Files:

• VBoxGuest.h (modified) (3 diffs)
• VMMDev.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -330 +330 @@
 AssertCompileSize(VBGLIOCDRIVERVERSIONINFO, 24 + 20);
 #if  !defined(__GNUC__) /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */ \
-  && (!defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__)))
+  && (!defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__) && (!defined(__WATCOMC__) || !defined(__cplusplus))))
 AssertCompile(VBGL_IOCTL_DRIVER_VERSION_INFO_SIZE_IN == 24 + 16);
 #endif
@@ -408 +408 @@
 AssertCompileSize(VBGLIOCHGCMCONNECT, 24 + 132);
 #if !defined(__GNUC__)  /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */ \
-  && (!defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__)))
+  && (!defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__) && (!defined(__WATCOMC__) || !defined(__cplusplus))))
 AssertCompile(VBGL_IOCTL_HGCM_CONNECT_SIZE_OUT == 24 + 4);
 #endif
@@ -1048 +1048 @@
 AssertCompileSize(VBGLIOCIDCCONNECT, 24 + 16 + (ARCH_BITS == 64 ? 8 : 4) * 2);
 #if  !defined(__GNUC__) /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */ \
-  && (!defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__)))
+  && (!defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__) && (!defined(__WATCOMC__) || !defined(__cplusplus))))
 AssertCompile(VBGL_IOCTL_IDC_CONNECT_SIZE_IN == 24 + 16);
 #endif

trunk/include/VBox/VMMDev.h

@@ -421 +421 @@
 DECLINLINE(size_t) vmmdevGetMousePointerReqSize(uint32_t width, uint32_t height)
 {
-    size_t cbBase = RT_OFFSETOF(VMMDevReqMousePointer, pointerData);
+    size_t cbBase = RT_OFFSETOF(VMMDevReqMousePointer, pointerData[0]);
     size_t cbMask = (width + 7) / 8 * height;
     size_t cbArgb = width * height * 4;