mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 02:51:27 +00:00
Fix all the packed structures.
Now we actually build a significant amount of stuff on Linux.
This commit is contained in:
@ -238,7 +238,7 @@ bool AsyncFileSeek (
|
||||
*
|
||||
***/
|
||||
|
||||
#include <PshPack1.h>
|
||||
#pragma pack(push,1)
|
||||
struct AsyncSocketConnectPacket {
|
||||
uint8_t connType;
|
||||
uint16_t hdrBytes;
|
||||
@ -247,7 +247,7 @@ struct AsyncSocketConnectPacket {
|
||||
uint32_t branchId;
|
||||
Uuid productId;
|
||||
};
|
||||
#include <PopPack.h>
|
||||
#pragma pack(pop)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
|
@ -122,7 +122,7 @@ void LogUnregisterHandler (FLogHandler callback) {
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
void __cdecl LogMsg (ELogSeverity severity, const char format[], ...) {
|
||||
void CDECL LogMsg (ELogSeverity severity, const char format[], ...) {
|
||||
ASSERT(format);
|
||||
|
||||
va_list args;
|
||||
@ -132,7 +132,7 @@ void __cdecl LogMsg (ELogSeverity severity, const char format[], ...) {
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
void __cdecl LogMsg (ELogSeverity severity, const wchar_t format[], ...) {
|
||||
void CDECL LogMsg (ELogSeverity severity, const wchar_t format[], ...) {
|
||||
ASSERT(format);
|
||||
|
||||
va_list args;
|
||||
|
@ -63,7 +63,7 @@ const unsigned kAsyncTimeInfinite = (unsigned) -1;
|
||||
#ifdef _MSC_VER
|
||||
#define THREADCALL __stdcall
|
||||
#else
|
||||
#define THREADCALL __cdecl
|
||||
#define THREADCALL CDECL
|
||||
#endif
|
||||
|
||||
struct AsyncThread;
|
||||
|
Reference in New Issue
Block a user