non-functional change [Win32/msvc only]: Small cleanup to pragma packing syntax.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1335 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-06-06 09:17:33 +00:00
parent c4531a5c31
commit 3734d47351
2 changed files with 5 additions and 4 deletions

View File

@ -900,7 +900,7 @@ static void __fastcall slice_non_intra_DCT (decoder_t * const decoder,
}
#if defined(_MSC_VER)
#pragma pack(push, 1)
#pragma pack(1)
#endif
struct TGA_HEADER
{
@ -922,7 +922,7 @@ struct TGA_HEADER
// pixel data follows header
#if defined(_MSC_VER)
};
#pragma pack(pop)
#pragma pack()
#else
} __attribute__((packed));
#endif

View File

@ -29,7 +29,7 @@ union regInfo {
};
#if defined(_MSC_VER)
#pragma pack(push, 1)
#pragma pack(1)
#pragma warning(disable:4996)
#endif
__declspec(align(16)) struct microRegInfo { // Ordered for Faster Compares
@ -44,7 +44,8 @@ __declspec(align(16)) struct microRegInfo { // Ordered for Faster Compares
u8 padding[7]; // 160 bytes
#if defined(_MSC_VER)
};
#pragma pack(pop)
#pragma pack()
#pragma pack(show)
#else
} __attribute__((packed));
#endif