From 48bbdd17082d79081787b6892889337a6dd52b24 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 3 May 2011 13:44:14 +0200
Subject: PS2: Fix various forbidden symbol clashes

---
 backends/platform/ps2/Gs2dScreen.cpp  | 2 ++
 backends/platform/ps2/irxboot.cpp     | 2 +-
 backends/platform/ps2/ps2input.cpp    | 2 ++
 backends/platform/ps2/ps2mutex.cpp    | 2 ++
 backends/platform/ps2/ps2pad.cpp      | 2 ++
 backends/platform/ps2/ps2time.cpp     | 2 ++
 backends/platform/ps2/savefilemgr.cpp | 4 ++++
 backends/platform/ps2/systemps2.cpp   | 5 +++++
 backends/platform/ps2/systemps2.h     | 4 +---
 9 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'backends/platform/ps2')

diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp
index e43ea0f376..c228a12b26 100644
--- a/backends/platform/ps2/Gs2dScreen.cpp
+++ b/backends/platform/ps2/Gs2dScreen.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include "Gs2dScreen.h"
 #include <kernel.h>
 #include <malloc.h>
diff --git a/backends/platform/ps2/irxboot.cpp b/backends/platform/ps2/irxboot.cpp
index 5ab7823e63..cc23df6575 100644
--- a/backends/platform/ps2/irxboot.cpp
+++ b/backends/platform/ps2/irxboot.cpp
@@ -73,7 +73,7 @@ PS2Device detectBootPath(const char *elfPath, char *bootPath) {
 
 	PS2Device device = _getDev(elfPath);
 
-	printf("elf path: %s, device %d\n", elfPath, device);
+	sioprintf("elf path: %s, device %d\n", elfPath, device);
 
 	strcpy(bootPath, elfPath);
 
diff --git a/backends/platform/ps2/ps2input.cpp b/backends/platform/ps2/ps2input.cpp
index 964a773f7e..6da21172ad 100644
--- a/backends/platform/ps2/ps2input.cpp
+++ b/backends/platform/ps2/ps2input.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <kernel.h>
 #include <malloc.h>
 #include <assert.h>
diff --git a/backends/platform/ps2/ps2mutex.cpp b/backends/platform/ps2/ps2mutex.cpp
index fe76202f32..974cf00f56 100644
--- a/backends/platform/ps2/ps2mutex.cpp
+++ b/backends/platform/ps2/ps2mutex.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include "backends/platform/ps2/systemps2.h"
 
 void OSystem_PS2::initMutexes(void) {
diff --git a/backends/platform/ps2/ps2pad.cpp b/backends/platform/ps2/ps2pad.cpp
index 3d285eedd5..090a5f2a35 100644
--- a/backends/platform/ps2/ps2pad.cpp
+++ b/backends/platform/ps2/ps2pad.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <kernel.h>
 #include <malloc.h>
 #include <assert.h>
diff --git a/backends/platform/ps2/ps2time.cpp b/backends/platform/ps2/ps2time.cpp
index 4da8420478..4c682cb9f2 100644
--- a/backends/platform/ps2/ps2time.cpp
+++ b/backends/platform/ps2/ps2time.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include "backends/platform/ps2/systemps2.h"
 #include "backends/platform/ps2/ps2debug.h"
 #include "eecodyvdfs.h"
diff --git a/backends/platform/ps2/savefilemgr.cpp b/backends/platform/ps2/savefilemgr.cpp
index a4b3ddb971..871ce11ef6 100644
--- a/backends/platform/ps2/savefilemgr.cpp
+++ b/backends/platform/ps2/savefilemgr.cpp
@@ -23,6 +23,10 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
+#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
+
 #include "common/config-manager.h"
 #include "common/zlib.h"
 
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index e95a026d01..aed2378faf 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -568,6 +568,11 @@ void OSystem_PS2::updateScreen(void) {
 	_screen->updateScreen();
 }
 
+void OSystem_PS2::displayMessageOnOSD(const char *msg) {
+	/* TODO : check */
+	printf("displayMessageOnOSD: %s\n", msg);
+}
+
 uint32 OSystem_PS2::getMillis(void) {
 	return msecCount;
 }
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 54e6f05798..26e3105cd9 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -79,9 +79,7 @@ public:
 	virtual Graphics::Surface *lockScreen();
 	virtual void unlockScreen();
 	virtual void updateScreen();
-	/* TODO : check */
-	virtual void displayMessageOnOSD(const char *msg) { printf("displayMessageOnOSD: %s\n", msg); };
-	/* */
+	virtual void displayMessageOnOSD(const char *msg);
 
 	virtual void showOverlay();
 	virtual void hideOverlay();
-- 
cgit v1.2.3