Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 03:18:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[hle/service/nifm] fix pack(pop) warning on clang (#3764)
Some checks are pending
tx-src / sources (push) Waiting to run
Details
Check Strings / check-strings (push) Waiting to run
Details

Browse source 
fucks up unity builds, also it's an innocuous trivial change for a warning that should've been fixed a while ago

Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3764
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2026-03-23 18:03:54 +01:00 • committed by crueter
parent 56d3f0e353
commit b673dad40d
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/service/nifm/nifm.cpp
View file

@ -183,8 +183,8 @@ struct NifmWirelessSettingData {
static_assert(sizeof(NifmWirelessSettingData) == 0x70, static_assert(sizeof(NifmWirelessSettingData) == 0x70,
"NifmWirelessSettingData has incorrect size."); "NifmWirelessSettingData has incorrect size.");
#pragma pack(push, 1)
// This is nn::nifm::detail::sf::NetworkProfileData // This is nn::nifm::detail::sf::NetworkProfileData
#pragma pack(push, 1)
struct SfNetworkProfileData { struct SfNetworkProfileData {
IpSettingData ip_setting_data{}; IpSettingData ip_setting_data{};
u128 uuid{}; u128 uuid{};
@ -196,9 +196,11 @@ struct SfNetworkProfileData {
SfWirelessSettingData wireless_setting_data{}; SfWirelessSettingData wireless_setting_data{};
INSERT_PADDING_BYTES(1); INSERT_PADDING_BYTES(1);
}; };
#pragma pack(pop)
static_assert(sizeof(SfNetworkProfileData) == 0x17C, "SfNetworkProfileData has incorrect size."); static_assert(sizeof(SfNetworkProfileData) == 0x17C, "SfNetworkProfileData has incorrect size.");
// This is nn::nifm::NetworkProfileData // This is nn::nifm::NetworkProfileData
#pragma pack(push, 1)
struct NifmNetworkProfileData { struct NifmNetworkProfileData {
u128 uuid{}; u128 uuid{};
std::array<char, 0x40> network_name{}; std::array<char, 0x40> network_name{};
@ -210,8 +212,8 @@ struct NifmNetworkProfileData {
NifmWirelessSettingData wireless_setting_data{}; NifmWirelessSettingData wireless_setting_data{};
IpSettingData ip_setting_data{}; IpSettingData ip_setting_data{};
}; };
static_assert(sizeof(NifmNetworkProfileData) == 0x18E, #pragma pack(pop)
"NifmNetworkProfileData has incorrect size."); static_assert(sizeof(NifmNetworkProfileData) == 0x18E, "NifmNetworkProfileData has incorrect size.");
struct PendingProfile { struct PendingProfile {
std::array<char, 0x21> ssid{}; std::array<char, 0x21> ssid{};