Index: /trunk/src/VBox/Devices/PC/DevPIC.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DevPIC.cpp	(revision 489)
+++ /trunk/src/VBox/Devices/PC/DevPIC.cpp	(revision 490)
@@ -54,4 +54,5 @@
 
 
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -67,4 +68,5 @@
 
 __END_DECLS
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
 
 
@@ -119,4 +121,7 @@
     /** Pointer to the device instance, GCPtr. */
     GCPTRTYPE(PPDMDEVINS) pDevInsGC;
+#if HC_ARCH_BITS == 64 && GC_ARCH_BITS != 64
+    RTGCPTR               Alignment0;
+#endif
 } PicState;
 
@@ -128,14 +133,17 @@
     /** The two interrupt controllers. */
     PicState                aPics[2];
+    /** Pointer to the PIC R3 helpers. */
+    PCPDMPICHLPR3           pPicHlpR3;
+    /** Pointer to the PIC R0 helpers. */
+    PCPDMPICHLPR0           pPicHlpR0;
+    /** Pointer to the PIC GC helpers. */
+    PCPDMPICHLPGC           pPicHlpGC;
+    /** Pointer to the device instance - GC Ptr. */
+    GCPTRTYPE(PPDMDEVINS)   pDevInsGC;
     /** Pointer to the device instance - GC Ptr. */
     HCPTRTYPE(PPDMDEVINS)   pDevInsHC;
-    /** Pointer to the device instance - GC Ptr. */
-    GCPTRTYPE(PPDMDEVINS)   pDevInsGC;
-    /** Pointer to the PIC R3 helpers. */
-    PCPDMPICHLPR3           pPicHlpR3;
-    /** Pointer to the PIC GC helpers. */
-    PCPDMPICHLPGC           pPicHlpGC;
-    /** Pointer to the PIC R0 helpers. */
-    PCPDMPICHLPR0           pPicHlpR0;
+#if HC_ARCH_BITS == 32
+    uint32_t                Alignmnet0;
+#endif
 #ifdef VBOX_WITH_STATISTICS
     STAMCOUNTER             StatSetIrqGC;
@@ -147,4 +155,6 @@
 } DEVPIC, *PDEVPIC;
 
+
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
 #ifdef LOG_ENABLED
 static inline void DumpPICState(PicState *s, char *szFn)
@@ -1105,4 +1115,4 @@
 
 #endif /* IN_RING3 */
-
-
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
+