mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Fix all the packed structures.
Now we actually build a significant amount of stuff on Linux.
This commit is contained in:
@ -218,7 +218,7 @@ COMPILER_ASSERT_HEADER(Cli2Auth, kNumAuth2CliMessages <= (uint16_t)-1);
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -1046,4 +1046,4 @@ struct Auth2Cli_ScoreGetRanksReply {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
@ -101,7 +101,7 @@ COMPILER_ASSERT_HEADER(Cli2Scr, kNumCsr2CliMessages <= (uint16_t)-1);
|
||||
* Networked structures
|
||||
*
|
||||
***/
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
//============================================================================
|
||||
// Connect packet
|
||||
@ -174,5 +174,5 @@ struct Csr2Cli_LoginReply : Cli2Csr_MsgHeader {
|
||||
};
|
||||
|
||||
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
@ -97,7 +97,7 @@ static const unsigned kFileSrvBuildId = 0;
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -208,4 +208,4 @@ struct File2Cli_FileDownloadReply : Cli2File_MsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
@ -86,7 +86,7 @@ COMPILER_ASSERT_HEADER(Cli2Game, kNumGame2CliMessages <= (uint16_t)-1);
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -191,4 +191,4 @@ struct Game2Cli_GameMgrMsg {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
@ -78,7 +78,7 @@ COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumGateKeeper2CliMessages <= (uint16_t)-
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -154,4 +154,5 @@ struct GateKeeper2Cli_AuthSrvIpAddressReply {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
wchar_t address[24];
|
||||
};
|
||||
};
|
||||
#pragma pack(pop)
|
||||
|
@ -160,7 +160,7 @@ enum {
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -554,7 +554,7 @@ struct Db2Srv_CsrAcctInfoReply : SrvMsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
// Srv2Log
|
||||
enum {
|
||||
@ -103,7 +103,7 @@ struct Srv2Log_LogMsg : SrvMsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -96,7 +96,7 @@ enum {
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -252,7 +252,7 @@ struct Mcp2Srv_PropagateBuffer : SrvMsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
// kNetProtocolSrv2Score messages
|
||||
enum {
|
||||
@ -169,7 +169,7 @@ struct Score2Srv_ScoreGetRanksReply : SrvMsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -68,7 +68,7 @@ enum {
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -129,7 +129,7 @@ struct State2Srv_ObjectFetched : SrvMsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -142,7 +142,7 @@ enum {
|
||||
//============================================================================
|
||||
// BEGIN PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
@ -453,7 +453,7 @@ struct Vault2Srv_CurrentPopulationRequest : SrvMsgHeader {
|
||||
//============================================================================
|
||||
// END PACKED DATA STRUCTURES
|
||||
//============================================================================
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
Reference in New Issue
Block a user