amalgamation

[picodrive.git] / Pico / cd / Memory.c

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index e0b5d08..71ec377 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -8,16 +8,18 @@
 \r
 #include "../PicoInt.h"\r
 \r
-#include "../sound/sound.h"\r
 #include "../sound/ym2612.h"\r
 #include "../sound/sn76496.h"\r
 \r
 #include "gfx_cd.h"\r
 #include "pcm.h"\r
 \r
+#ifndef UTYPES_DEFINED\r
 typedef unsigned char  u8;\r
 typedef unsigned short u16;\r
 typedef unsigned int   u32;\r
+#define UTYPES_DEFINED\r
+#endif\r
 \r
 //#define __debug_io\r
 //#define __debug_io2\r
@@ -1454,7 +1456,7 @@ static u32 PicoCheckPcS68k(u32 pc)
 #endif\r
 \r
 \r
-void PicoMemSetupCD()\r
+PICO_INTERNAL void PicoMemSetupCD(void)\r
 {\r
   dprintf("PicoMemSetupCD()");\r
 #ifdef EMU_C68K\r