Changeset 68586 in vbox

Timestamp:

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

Author:

vboxsync

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

117803

Message:

merging vbglioc r117764: VBoxGuest.h: OS/2 gradd build fix

File:

• trunk/include/VBox/VBoxGuest.h (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -328 +328 @@
 } VBGLIOCDRIVERVERSIONINFO, RT_FAR *PVBGLIOCDRIVERVERSIONINFO;
 AssertCompileSize(VBGLIOCDRIVERVERSIONINFO, 24 + 20);
-#ifndef __GNUC__ /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */
+#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__)))
 AssertCompile(VBGL_IOCTL_DRIVER_VERSION_INFO_SIZE_IN == 24 + 16);
 #endif
@@ -405 +406 @@
 } VBGLIOCHGCMCONNECT, RT_FAR *PVBGLIOCHGCMCONNECT;
 AssertCompileSize(VBGLIOCHGCMCONNECT, 24 + 132);
-#ifndef __GNUC__ /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */
+#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__)))
 AssertCompile(VBGL_IOCTL_HGCM_CONNECT_SIZE_OUT == 24 + 4);
 #endif
@@ -1044 +1046 @@
 } VBGLIOCIDCCONNECT, RT_FAR *PVBGLIOCIDCCONNECT;
 AssertCompileSize(VBGLIOCIDCCONNECT, 24 + 16 + (ARCH_BITS == 64 ? 8 : 4) * 2);
-#ifndef __GNUC__ /* Some GCC versions can't handle the complicated RT_UOFFSET_AFTER macro, it seems. */
+#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__)))
 AssertCompile(VBGL_IOCTL_IDC_CONNECT_SIZE_IN == 24 + 16);
 #endif