(MSVC) Build fixes

diff --git a/pico/cd/cd_memory.c b/pico/cd/cd_memory.c
index e660e35..6070161 100644 (file)
--- 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)\r
 {\r
   void *bank;\r
+  int i;\r
 \r
   // WORD RAM\r
   if (!(r3 & 4)) {\r
@@ -1074,7 +1075,6 @@ static void remap_word_ram(u32 r3)
 \r
 #ifdef EMU_F68K\r
   // update fetchmap..\r
-  int i;\r
   if (!(r3 & 4))\r
   {\r
     for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)\r

diff --git a/pico/z80if.c b/pico/z80if.c
index 8db4aa5..5efeff8 100644 (file)
--- 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