lsteamclient: Explicitly specify alignment of sub-structs

SteamNetConnectionInfo_t has 8-byte alignment on win32, but 4-byte on
Linux. Since we use the same struct on each in lsteamclient,
winSteamNetConnectionStatusChangedCallback_t_712's members would
incorrectly be aligned to 4-byte boundaries.
This commit is contained in:
Andrew Eikum
2019-05-30 15:20:14 -05:00
parent 5ed5cbf286
commit 381ab5f3dc
3 changed files with 68 additions and 58 deletions

View File

@ -63,8 +63,8 @@ void cb_RequestPlayersForGameProgressCallback_t_16(const struct RequestPlayersFo
struct winRequestPlayersForGameResultCallback_t_64 {
EResult m_eResult;
uint64 m_ullSearchID;
CSteamID m_SteamIDPlayerFound;
CSteamID m_SteamIDLobby;
CSteamID m_SteamIDPlayerFound __attribute__((aligned(1)));
CSteamID m_SteamIDLobby __attribute__((aligned(1)));
RequestPlayersForGameResultCallback_t::PlayerAcceptState_t m_ePlayerAcceptState;
int32 m_nPlayerIndex;
int32 m_nTotalPlayersFound;
@ -105,7 +105,7 @@ void cb_RequestPlayersForGameFinalResultCallback_t_24(const struct RequestPlayer
struct winSubmitPlayerResultResultCallback_t_24 {
EResult m_eResult;
uint64 ullUniqueGameID;
CSteamID steamIDPlayer;
CSteamID steamIDPlayer __attribute__((aligned(1)));
} __attribute__ ((ms_struct));
#pragma pack( pop )
void cb_SubmitPlayerResultResultCallback_t_24(const struct SubmitPlayerResultResultCallback_t *lin, struct winSubmitPlayerResultResultCallback_t_24 *win)
@ -131,7 +131,7 @@ void cb_EndGameResultCallback_t_16(const struct EndGameResultCallback_t *lin, st
struct winJoinPartyCallback_t_280 {
EResult m_eResult;
PartyBeaconID_t m_ulBeaconID;
CSteamID m_SteamIDBeaconOwner;
CSteamID m_SteamIDBeaconOwner __attribute__((aligned(1)));
char m_rgchConnectString[256];
} __attribute__ ((ms_struct));
#pragma pack( pop )
@ -845,7 +845,7 @@ void cb_GSReputation_t_40(const struct GSReputation_t *lin, struct winGSReputati
#pragma pack( push, 8 )
struct winSteamNetConnectionStatusChangedCallback_t_712 {
HSteamNetConnection m_hConn;
SteamNetConnectionInfo_t m_info;
SteamNetConnectionInfo_t m_info __attribute__((aligned(8)));
ESteamNetworkingConnectionState m_eOldState;
} __attribute__ ((ms_struct));
#pragma pack( pop )