From 2f21d4e506fcbfac710e121d2d973fcc70d8ca60 Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 18 Jun 2015 03:08:34 +0000 Subject: [PATCH] bsnes - use msvc struct packing in one place where needed --- libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp b/libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp index 75ce5e2534..04b06cce77 100644 --- a/libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp +++ b/libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp @@ -854,13 +854,23 @@ bool Handle_QUERY(eMessage msg) case eMessage_QUERY_peek_cpu_regs: { //watch it! the size of this struct is important! + #ifdef _MSC_VER + #pragma pack(push,1) + #endif struct { u32 pc; u16 a,x,y,z,s,d,vector; //7x u8 p, nothing; u32 aa,rd; u8 sp, dp, db, mdr; - } __attribute__((__packed__)) cpuregs; + } + #ifndef _MSC_VER + __attribute__((__packed__)) + #endif + cpuregs; + #ifdef _MSC_VER + #pragma pack(pop) + #endif cpuregs.pc = (u32)SNES::cpu.regs.pc; cpuregs.a = SNES::cpu.regs.a;