diff options
| author | Max Horn | 2011-06-06 15:39:05 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-06 15:39:05 +0200 |
| commit | 0e20bc0086f9e65454334c7a8f647d796188c0cf (patch) | |
| tree | a213016c9a5354d7200a7aec805a1326414ce965 | |
| parent | b0b5a1d80298452b5eb431e3481850e850f79f52 (diff) | |
| download | scummvm-rg350-0e20bc0086f9e65454334c7a8f647d796188c0cf.tar.gz scummvm-rg350-0e20bc0086f9e65454334c7a8f647d796188c0cf.tar.bz2 scummvm-rg350-0e20bc0086f9e65454334c7a8f647d796188c0cf.zip | |
COMMON: Remove PS2 / NDS hacks in system.cpp
| -rw-r--r-- | common/system.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/common/system.cpp b/common/system.cpp index 307079d112..298f1d7d0d 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -20,9 +20,10 @@ * */ -// Disable symbol overrides so that we can use system headers. -// FIXME: Necessary for the PS2 port, should get rid of this eventually. -#define FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_exit +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE +#define FORBIDDEN_SYMBOL_EXCEPTION_fputs +#define FORBIDDEN_SYMBOL_EXCEPTION_fflush #include "common/system.h" #include "common/str.h" @@ -31,21 +32,6 @@ #include "backends/audiocd/default/default-audiocd.h" -#ifdef __PLAYSTATION2__ - // for those replaced fopen/fread/etc functions - #include "backends/platform/ps2/fileio.h" - - #define fputs(str, file) ps2_fputs(str, file) - #define fflush(a) ps2_fflush(a) -#endif - -#ifdef __DS__ - #include "backends/fs/ds/ds-fs.h" - - #define fputs(str, file) DS::std_fwrite(str, strlen(str), 1, file) - #define fflush(file) DS::std_fflush(file) -#endif - OSystem *g_system = 0; OSystem::OSystem() { @@ -110,6 +96,7 @@ Common::String OSystem::getDefaultConfigFileName() { } void OSystem::logMessage(LogMessageType::Type type, const char *message) { +#if !defined(__PLAYSTATION2__) && !defined(__DS__) FILE *output = 0; if (type == LogMessageType::kInfo || type == LogMessageType::kDebug) @@ -119,6 +106,7 @@ void OSystem::logMessage(LogMessageType::Type type, const char *message) { fputs(message, output); fflush(output); +#endif } Common::String OSystem::getSystemLanguage() const { |