Index: /trunk/src/VBox/Devices/Graphics/DevVGA.h
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA.h	(revision 22840)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA.h	(revision 22841)
@@ -283,5 +283,5 @@
     /** Whether to render the guest VRAM to the framebuffer memory. False only for some LFB modes. */
     bool                        fRenderVRAM;
-    bool                        padding9[2];
+    bool                        Padding1[2];
 
     uint32_t                    cMonitors;
@@ -292,5 +292,5 @@
 
     /** Current refresh timer interval. */
-    uint32_t                    padding10;
+    uint32_t                    Padding2;
     uint32_t                    cMilliesRefreshInterval;
     /** Refresh timer handle - HC. */
@@ -318,4 +318,8 @@
     /** VBVA callbacks interface */
     PDMDDISPLAYVBVACALLBACKS    VBVACallbacks;
+#else
+# if HC_ARCH_BITS == 32
+    uint32_t                    Padding3;
+# endif
 #endif
     /** Pointer to base interface of the driver. */
@@ -351,7 +355,7 @@
     /** VBE Extra Data write address one byte buffer */
     uint8_t                     cbWriteVBEExtraAddress;
-    uint8_t                     Padding6;       /**< Alignment padding. */
+    uint8_t                     Padding4;
 # else
-    uint8_t                     Padding6[2];    /**< Alignment padding. */
+    uint8_t                     Padding4[2];
 # endif
 #endif
@@ -364,5 +368,5 @@
     /** The VBE BIOS current memory address. */
     uint16_t                    u16VBEExtraAddress;
-    uint16_t                    Padding7[2];    /**< Alignment padding. */
+    uint16_t                    Padding5[2];
 #endif
     /** Current logo data offset. */
@@ -394,5 +398,5 @@
     /** Clear screen flag. */
     uint8_t                     fLogoClearScreen;
-    uint8_t                     Padding8[7];    /**< Alignment padding. */
+    uint8_t                     Padding6[7];
     /** Palette data. */
     uint32_t                    au32LogoPalette[256];
@@ -401,5 +405,5 @@
     /** Base port in the assigned PCI I/O space. */
     RTIOPORT                    IOPortBase;
-    uint8_t                     Padding11[6];    /**< Alignment padding. */
+    uint8_t                     Padding7[6];
 #endif /* VBOX_WITH_HGSMI */
 } VGAState;