From 3734d4735193dae7a89a7088ab6f7f181bb91d4a Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sat, 6 Jun 2009 09:17:33 +0000 Subject: [PATCH] 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 --- pcsx2/IPU/mpeg2lib/Mpeg.cpp | 4 ++-- pcsx2/x86/microVU_IR.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pcsx2/IPU/mpeg2lib/Mpeg.cpp b/pcsx2/IPU/mpeg2lib/Mpeg.cpp index 85fb80e084..60639366b2 100644 --- a/pcsx2/IPU/mpeg2lib/Mpeg.cpp +++ b/pcsx2/IPU/mpeg2lib/Mpeg.cpp @@ -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 diff --git a/pcsx2/x86/microVU_IR.h b/pcsx2/x86/microVU_IR.h index a5bcd8c6b8..740fd36bb5 100644 --- a/pcsx2/x86/microVU_IR.h +++ b/pcsx2/x86/microVU_IR.h @@ -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