From 6732b5aa452171d58778bb3dfe62232b0fd73866 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 17 Mar 2014 18:28:30 +0100 Subject: [PATCH] (MSVC) Build fixes --- pico/cd/cd_memory.c | 2 +- pico/z80if.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pico/cd/cd_memory.c b/pico/cd/cd_memory.c index e660e35b..60701612 100644 --- a/pico/cd/cd_memory.c +++ b/pico/cd/cd_memory.c @@ -1044,6 +1044,7 @@ static void remap_prg_window(u32 r1, u32 r3) static void remap_word_ram(u32 r3) { void *bank; + int i; // WORD RAM if (!(r3 & 4)) { @@ -1074,7 +1075,6 @@ static void remap_word_ram(u32 r3) #ifdef EMU_F68K // update fetchmap.. - int i; if (!(r3 & 4)) { for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++) diff --git a/pico/z80if.c b/pico/z80if.c index 8db4aa5c..5efeff89 100644 --- a/pico/z80if.c +++ b/pico/z80if.c @@ -121,8 +121,8 @@ static int z80_unpack_legacy(const void *data) } #elif defined(_USE_CZ80) if (*(int *)data == 0x00007a43) { // "Cz" save? - memcpy(&CZ80, data+8, offsetof(cz80_struc, BasePC)); - Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4)); + memcpy(&CZ80, (int*)data+8, offsetof(cz80_struc, BasePC)); + Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)((int*)data+4)); return 0; } #endif -- 2.39.5