mirror of https://github.com/PCSX2/pcsx2.git
Core: Remove __packed macro
This commit is contained in:
parent
f7476dfb63
commit
67299fcd9f
|
@ -87,14 +87,6 @@ static const int __pagesize = PCSX2_PAGESIZE;
|
|||
// --------------------------------------------------------------------------------------
|
||||
#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 __noreturn __declspec(noreturn)
|
||||
|
||||
|
@ -110,10 +102,6 @@ static const int __pagesize = PCSX2_PAGESIZE;
|
|||
// GCC / Intel Compilers Section
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
||||
#ifndef __packed
|
||||
#define __packed __attribute__((packed))
|
||||
#endif
|
||||
|
||||
#define __assume(cond) do { if (!(cond)) __builtin_unreachable(); } while(0)
|
||||
#define CALLBACK __attribute__((stdcall))
|
||||
|
||||
|
|
|
@ -30,20 +30,16 @@
|
|||
// romdir structure (packing required!)
|
||||
// --------------------------------------------------------------------------------------
|
||||
//
|
||||
#if defined(_MSC_VER)
|
||||
# pragma pack(1)
|
||||
#endif
|
||||
#pragma pack(push, 1)
|
||||
|
||||
struct romdir
|
||||
{
|
||||
char fileName[10];
|
||||
u16 extInfoSize;
|
||||
u32 fileSize;
|
||||
} __packed; // +16
|
||||
};
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# pragma pack()
|
||||
#endif
|
||||
#pragma pack(pop)
|
||||
|
||||
static_assert( sizeof(romdir) == DIRENTRY_SIZE, "romdir struct not packed to 16 bytes" );
|
||||
|
||||
|
|
Loading…
Reference in New Issue