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

Core: Remove __packed macro

This commit is contained in:
TellowKrinkle 2021-11-02 22:31:11 -05:00 committed by tellowkrinkle
parent f7476dfb63
commit 67299fcd9f
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/Pcsx2Defs.h
View File

@ -87,14 +87,6 @@ static const int __pagesize = PCSX2_PAGESIZE;
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
#ifdef _MSC_VER #ifdef _MSC_VER
// Using these breaks compat with VC2005; so we're not using it yet.
//# define __pack_begin __pragma(pack(1))
//# define __pack_end __pragma(pack())
// This is the 2005/earlier compatible packing define, which must be used in conjunction
// with #ifdef _MSC_VER/#pragma pack() directives (ugly).
#define __packed
#define __noinline __declspec(noinline) #define __noinline __declspec(noinline)
#define __noreturn __declspec(noreturn) #define __noreturn __declspec(noreturn)
@ -110,10 +102,6 @@ static const int __pagesize = PCSX2_PAGESIZE;
// GCC / Intel Compilers Section // GCC / Intel Compilers Section
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
#ifndef __packed
#define __packed __attribute__((packed))
#endif
#define __assume(cond) do { if (!(cond)) __builtin_unreachable(); } while(0) #define __assume(cond) do { if (!(cond)) __builtin_unreachable(); } while(0)
#define CALLBACK __attribute__((stdcall)) #define CALLBACK __attribute__((stdcall))

10
pcsx2/ps2/BiosTools.cpp
View File

@ -30,20 +30,16 @@
// romdir structure (packing required!) // romdir structure (packing required!)
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// //
#if defined(_MSC_VER) #pragma pack(push, 1)
# pragma pack(1)
#endif
struct romdir struct romdir
{ {
char fileName[10]; char fileName[10];
u16 extInfoSize; u16 extInfoSize;
u32 fileSize; u32 fileSize;
} __packed; // +16 };
#ifdef _MSC_VER #pragma pack(pop)
# pragma pack()
#endif
static_assert( sizeof(romdir) == DIRENTRY_SIZE, "romdir struct not packed to 16 bytes" ); static_assert( sizeof(romdir) == DIRENTRY_SIZE, "romdir struct not packed to 16 bytes" );