Changeset 33534 in vbox

Timestamp:

Oct 28, 2010 7:32:14 AM (14 years ago)

Author:

vboxsync

Message:

#pragma pack() not pragma pack(0)

Location:

trunk/src/VBox/Devices/Storage

Files:

• DMGHDDCore.cpp (modified) (3 diffs)
• VBoxHDDFormats/AppleDiskImage/VBoxDMG.cpp (modified) (1 diff)
• VCICacheCore.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DMGHDDCore.cpp

@@ -112 +112 @@
     uint32_t            au32Unknown[3];         /**< 0x1f4 - Unknown stuff, hdiutil doesn't dump it... */
 } DMGUDIF;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(DMGUDIF, 512);
 AssertCompileMemberOffset(DMGUDIF, cbRsrc,   0x030);
@@ -169 +169 @@
     uint32_t            cBlocksRunCount;        /**< 0x    - Number of entries in the blkx run table afterwards. */
 } DMGBLKX;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(DMGBLKX, 204);
 
@@ -198 +198 @@
     uint64_t            cbData;                 /**< 0x020 - Number of bytes in the image. */
 } DMGBLKXDESC;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(DMGBLKXDESC, 40);
 

trunk/src/VBox/Devices/Storage/VBoxHDDFormats/AppleDiskImage/VBoxDMG.cpp

@@ -107 +107 @@
     uint32_t            au32Unknown[3];         /**< 0x1f4 - Unknown stuff, hdiutil doesn't dump it... */
 } VBOXUDIF;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(VBOXUDIF, 512);
 AssertCompileMemberOffset(VBOXUDIF, cbRsrc,   0x030);

trunk/src/VBox/Devices/Storage/VCICacheCore.cpp

@@ -78 +78 @@
     uint8_t     abReserved[951];
 } VciHdr, *PVciHdr;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(VciHdr, 2 * VCI_BLOCK_SIZE);
 
@@ -119 +119 @@
     uint64_t    u64BlockAddr;
 } VciCacheExtent, *PVciCacheExtent;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(VciCacheExtent, 38);
 
@@ -137 +137 @@
     uint64_t    u64ChildAddr;
 } VciTreeNodeInternal, *PVciTreeNodeInternal;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(VciTreeNodeInternal, 20);
 
@@ -153 +153 @@
     uint8_t     au8Data[4095];
 } VciTreeNode, *PVciTreeNode;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(VciTreeNode, 8 * VCI_BLOCK_SIZE);
 
@@ -189 +189 @@
     uint8_t      au8Reserved[472];
 } VciBlkMap, *PVciBlkMap;
-#pragma pack(0)
+#pragma pack()
 AssertCompileSize(VciBlkMap, VCI_BLOCK_SIZE);