From: Twinaphex <libretro@gmail.com>
Date: Mon, 17 Mar 2014 17:28:30 +0000 (+0100)
Subject: (MSVC) Build fixes
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6732b5aa452171d58778bb3dfe62232b0fd73866;p=picodrive.git

(MSVC) Build fixes
---

diff --git a/pico/cd/cd_memory.c b/pico/cd/cd_memory.c
index e660e35..6070161 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 8db4aa5..5efeff8 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