Changeset 38602 in vbox

Timestamp:

Sep 1, 2011 5:10:23 PM (14 years ago)

Author:

vboxsync

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

73805

Message:

Additions/common/VBoxGuest: try to fix a burn

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -171 +171 @@
      *          following it (to grow into and align the struct size).
      */
-#if HC_ARCH_BITS == 32  /* Disabled for now to prevent a zero-sized array. */
-    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 20 : 0];
+#ifdef VBOXGUEST_USE_DEFERRED_WAKE_UP
+    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 12 : 52];
+#else
+    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 20 : 4];
 #endif
 
@@ -188 +190 @@
 typedef VBOXGUESTDEVEXT *PVBOXGUESTDEVEXT;
 
+#if defined(VBOXGUEST_USE_DEFERRED_WAKE_UP) && HC_ARCH_BITS == 64
+AssertCompileMemberOffset(VBOXGUESTDEVEXT, win, 384);
+#elif HC_ARCH_BITS == 64
+AssertCompileMemberOffset(VBOXGUESTDEVEXT, win, 320);
+#else
+AssertCompileMemberOffset(VBOXGUESTDEVEXT, win, 256);
+#endif
 AssertCompileMemberSizeAlignment(VBOXGUESTDEVEXT, win, 64);