Fix more conflicting types for prototypes

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