linux port fixed; some cleanups

[libpicofe.git] / gp2x / emu.c

diff --git a/gp2x/emu.c b/gp2x/emu.c
index c78b706..46dc3aa 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006-2007 notaz, All rights reserved.\r
+// (c) Copyright 2006-2009 notaz, All rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
@@ -8,15 +8,11 @@
 #include <sys/time.h>\r
 #include <sys/stat.h>\r
 #include <sys/types.h>\r
-#include <linux/limits.h>\r
-#include <ctype.h>\r
-#include <unistd.h>\r
-\r
 #include <stdarg.h>\r
 \r
-#include "emu.h"\r
 #include "plat_gp2x.h"\r
 #include "soc.h"\r
+#include "../common/plat.h"\r
 #include "../common/menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/fonts.h"\r
@@ -158,7 +154,7 @@ void emu_prepareDefaultConfig(void)
                defaultConfig.s_PicoOpt |= POPT_EXT_FM;\r
 }\r
 \r
-void osd_text(int x, int y, const char *text)\r
+static void osd_text(int x, int y, const char *text)\r
 {\r
        int len = strlen(text)*8;\r
        int *p, i, h, offs;\r