Merge pull request #6169 from degasus/master

Core: Fix pragma pack usages.
dolphin-emu · Nov 5, 2017 · ce497e7 · ce497e7
2 parents bb07947 + 3a36c96
commit ce497e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
@@ -151,6 +151,7 @@ struct ExtensionReg
   // address 0xFA
   u8 constant_id[6];
 };
+#pragma pack(pop)
 
 void EmulateShake(AccelData* const accel_data, ControllerEmu::Buttons* const buttons_group,
                   u8* const shake_step);
@@ -291,6 +292,7 @@ class Wiimote : public ControllerEmu::EmulatedController
 
   wiimote_key m_ext_key;
 
+#pragma pack(push, 1)
   u8 m_eeprom[WIIMOTE_EEPROM_SIZE];
   struct MotionPlusReg
   {

diff --git a/Source/Core/Core/WiiUtils.cpp b/Source/Core/Core/WiiUtils.cpp
@@ -561,7 +561,7 @@ class DiscSystemUpdater final : public SystemUpdater
   UpdateResult DoDiscUpdate();
 
 private:
-#pragma pack(push, 8)
+#pragma pack(push, 1)
   struct ManifestHeader
   {
     char timestamp[0x10];  // YYYY/MM/DD
@@ -581,9 +581,10 @@ class DiscSystemUpdater final : public SystemUpdater
     char path[0x40];
     u64 title_id;
     u16 title_version;
+    u16 unused1[3];
     char name[0x40];
     char info[0x40];
-    u8 unused[0x120];
+    u8 unused2[0x120];
   };
   static_assert(sizeof(Entry) == 512, "Wrong size");
 #pragma pack(pop)