3 files changed, 13 insertions, 14 deletions
diff --git a/backends/platform/gp2x/gp2x-hw.cpp b/backends/platform/gp2x/gp2x-hw.cpp
index 6f544258ec..8818ff9fe9 100644
--- a/backends/platform/gp2x/gp2x-hw.cpp
+++ b/backends/platform/gp2x/gp2x-hw.cpp
@@ -51,6 +51,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+extern "C" {
+static unsigned long gp2x_dev[8]={0,0,0,0,0,0,0,0};//, gp2x_ticks_per_second;
+}
+
 namespace GP2X_HW {
 
 enum {
diff --git a/backends/platform/gp2x/gp2x-mem.cpp b/backends/platform/gp2x/gp2x-mem.cpp
index 4a1802f311..0968087cfd 100644
--- a/backends/platform/gp2x/gp2x-mem.cpp
+++ b/backends/platform/gp2x/gp2x-mem.cpp
@@ -42,8 +42,11 @@
 
 #include "backends/platform/gp2x/gp2x-mem.h"
 
-void SetClock (unsigned c)
-{
+extern "C" {
+static volatile unsigned short *gp2x_memregs;
+}
+
+void SetClock (unsigned c) {
 	unsigned v;
 	unsigned mdiv,pdiv=3,scale=0;
 
@@ -57,8 +60,7 @@ void SetClock (unsigned c)
     gp2x_memregs[0x910>>1] = v;
 }
 
-void patchMMU (void)
-{
+void patchMMU (void) {
 	//volatile unsigned int *secbuf = (unsigned int *)malloc (204800);
 
 	printf ("Reconfiguring cached memory regions...\n");
@@ -71,19 +73,15 @@ void patchMMU (void)
 
 	int mmufd = open("/dev/mmuhack", O_RDWR);
 
-	if(mmufd < 0)
-	{
+	if(mmufd < 0) {
 		printf ("Upper memory uncached (attempt failed, access to upper memory will be slower)...\n");
-	}
-	else
-	{
+	} else {
 		printf ("Upper memory cached...\n");
 		close(mmufd);
 	}
 }
 
-void unpatchMMU (void)
-{
+void unpatchMMU (void) {
 	printf ("Restoreing cached memory regions...\n");
 	system("/sbin/rmmod mmuhack");
 }
diff --git a/backends/platform/gp2x/gp2x-mem.h b/backends/platform/gp2x/gp2x-mem.h
index 24b2a3f569..aa49444164 100644
--- a/backends/platform/gp2x/gp2x-mem.h
+++ b/backends/platform/gp2x/gp2x-mem.h
@@ -47,9 +47,6 @@ extern void unpatchMMU (void);
 
 #define SYS_CLK_FREQ 7372800
 
-static          unsigned long   gp2x_dev[8]={0,0,0,0,0,0,0,0};//, gp2x_ticks_per_second;
-static volatile unsigned short *gp2x_ram, *gp2x_memregs;
-
 #ifdef __cplusplus
     }
 #endif