ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6169 from degasus/master 

Core: Fix pragma pack usages.
This commit is contained in:
JosJuice 2017-11-05 13:25:16 +01:00 committed by GitHub
parent bb0794715c 3a36c964f5
commit ce497e7515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
View File

@ -151,6 +151,7 @@ struct ExtensionReg
// address 0xFA // address 0xFA
u8 constant_id[6]; u8 constant_id[6];
}; };
#pragma pack(pop)
void EmulateShake(AccelData* const accel_data, ControllerEmu::Buttons* const buttons_group, void EmulateShake(AccelData* const accel_data, ControllerEmu::Buttons* const buttons_group,
u8* const shake_step); u8* const shake_step);
@ -291,6 +292,7 @@ private:
wiimote_key m_ext_key; wiimote_key m_ext_key;
#pragma pack(push, 1)
u8 m_eeprom[WIIMOTE_EEPROM_SIZE]; u8 m_eeprom[WIIMOTE_EEPROM_SIZE];
struct MotionPlusReg struct MotionPlusReg
{ {

5
Source/Core/Core/WiiUtils.cpp
View File

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