diff options
| author | Max Horn | 2011-05-03 12:52:28 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-03 12:52:28 +0200 |
| commit | 81ff18b0b725a09c2e8e024f8a835756b7fb5a3c (patch) | |
| tree | 233deb7e173d0308b193ae2fb4b9f4c63214b44a /backends/platform/wii | |
| parent | bf9b98f3162d36936f465e804682ca41515d2f09 (diff) | |
| download | scummvm-rg350-81ff18b0b725a09c2e8e024f8a835756b7fb5a3c.tar.gz scummvm-rg350-81ff18b0b725a09c2e8e024f8a835756b7fb5a3c.tar.bz2 scummvm-rg350-81ff18b0b725a09c2e8e024f8a835756b7fb5a3c.zip | |
WII: Fix various forbidden symbol clashes
Diffstat (limited to 'backends/platform/wii')
| -rw-r--r-- | backends/platform/wii/main.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/wii/osystem.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/wii/osystem.h | 1 | ||||
| -rw-r--r-- | backends/platform/wii/osystem_events.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/wii/osystem_gfx.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/wii/osystem_sfx.cpp | 2 |
6 files changed, 12 insertions, 1 deletions
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp index aa688534fc..959931de00 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 ccf6b22db6..7a2abe8c6b 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 d1ea8e07ae..0db5f92fff 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 5d0bca453f..8e51bbc673 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 c2be608999..b44c1270f5 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 33397f0a93..acab6df7e1 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" |