[Scummvm-cvs-logs] scummvm master -> 81ff18b0b725a09c2e8e024f8a835756b7fb5a3c

fingolfin max at quendi.de
Tue May 3 12:53:46 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
81ff18b0b7 WII: Fix various forbidden symbol clashes


Commit: 81ff18b0b725a09c2e8e024f8a835756b7fb5a3c
    https://github.com/scummvm/scummvm/commit/81ff18b0b725a09c2e8e024f8a835756b7fb5a3c
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T03:52:28-07:00

Commit Message:
WII: Fix various forbidden symbol clashes

Changed paths:
    backends/platform/wii/main.cpp
    backends/platform/wii/osystem.cpp
    backends/platform/wii/osystem.h
    backends/platform/wii/osystem_events.cpp
    backends/platform/wii/osystem_gfx.cpp
    backends/platform/wii/osystem_sfx.cpp



diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp
index aa68853..959931d 100644
--- a/backends/platform/wii/main.cpp
+++ b/backends/platform/wii/main.cpp
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index ccf6b22..7a2abe8 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -22,6 +22,9 @@
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
+// Allow printf for debugging
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <unistd.h>
 
 #include <ogc/conf.h>
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index d1ea8e0..0db5f92 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -24,7 +24,6 @@
 
 #include <gctypes.h>
 #include <gccore.h>
-#include <ogcsys.h>
 
 #include <gxflux/gfx.h>
 
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 5d0bca4..8e51bbc 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <unistd.h>
 #include <malloc.h>
 
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index c2be608..b44c127 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <malloc.h>
 
 #include <gxflux/gfx_con.h>
diff --git a/backends/platform/wii/osystem_sfx.cpp b/backends/platform/wii/osystem_sfx.cpp
index 33397f0..acab6df 100644
--- a/backends/platform/wii/osystem_sfx.cpp
+++ b/backends/platform/wii/osystem_sfx.cpp
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <malloc.h>
 
 #include "osystem.h"






More information about the Scummvm-git-logs mailing list