From: twinaphex <libretro@gmail.com>
Date: Sun, 12 Jul 2020 23:33:41 +0000 (+0200)
Subject: Fix more conflicting types for prototypes
X-Git-Tag: v2.00~709
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bee714816d7676194b8d6b2a9d04f75fbc3c637;p=picodrive.git

Fix more conflicting types for prototypes
---

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 8757f7ce..7d69bcab 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -955,8 +955,8 @@ void p32x_schedule_hint(SH2 *sh2, unsigned int m68k_cycles);
 
 // 32x/memory.c
 extern struct Pico32xMem *Pico32xMem;
-unsigned int PicoRead8_32x(u32 a);
-unsigned int PicoRead16_32x(u32 a);
+u32 PicoRead8_32x(u32 a);
+u32 PicoRead16_32x(u32 a);
 void PicoWrite8_32x(u32 a, u32 d);
 void PicoWrite16_32x(u32 a, u32 d);
 void PicoMemSetup32x(void);
@@ -964,10 +964,10 @@ void Pico32xSwapDRAM(int b);
 void Pico32xMemStateLoaded(void);
 void p32x_update_banks(void);
 void p32x_m68k_poll_event(u32 flags);
-unsigned int REGPARM(3) p32x_sh2_poll_memory8(u32 a, u32 d, SH2 *sh2);
-unsigned int REGPARM(3) p32x_sh2_poll_memory16(u32 a, u32 d, SH2 *sh2);
-unsigned int REGPARM(3) p32x_sh2_poll_memory32(u32 a, u32 d, SH2 *sh2);
-void *p32x_sh2_get_mem_ptr(unsigned int a, unsigned int *mask, SH2 *sh2);
+u32 REGPARM(3) p32x_sh2_poll_memory8(u32 a, u32 d, SH2 *sh2);
+u32 REGPARM(3) p32x_sh2_poll_memory16(u32 a, u32 d, SH2 *sh2);
+u32 REGPARM(3) p32x_sh2_poll_memory32(u32 a, u32 d, SH2 *sh2);
+void *p32x_sh2_get_mem_ptr(u32 a, u32 *mask, SH2 *sh2);
 void p32x_sh2_poll_detect(u32 a, SH2 *sh2, u32 flags, int maxcnt);
 void p32x_sh2_poll_event(SH2 *sh2, u32 flags, u32 m68k_cycles);
 int p32x_sh2_memcpy(u32 dst, u32 src, int count, int size, SH2 *sh2);