aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-10-31 21:49:53 +0000
committerMax Horn2010-10-31 21:49:53 +0000
commita41d4424af345c7ab89f8ffe06f96addf3ca751d (patch)
tree27a6cda854f42acd86ca428c28fd660f6e888539
parentae082b2b28d403f6994d8adbc50d553cc6ac8d54 (diff)
downloadscummvm-rg350-a41d4424af345c7ab89f8ffe06f96addf3ca751d.tar.gz
scummvm-rg350-a41d4424af345c7ab89f8ffe06f96addf3ca751d.tar.bz2
scummvm-rg350-a41d4424af345c7ab89f8ffe06f96addf3ca751d.zip
COMMON: Allow forbidden symbols in debug.cpp and textconsole.cpp
This is currently necessary for the PS2 port and possibly others. svn-id: r53989
-rw-r--r--common/debug.cpp4
-rw-r--r--common/textconsole.cpp9
2 files changed, 8 insertions, 5 deletions
diff --git a/common/debug.cpp b/common/debug.cpp
index 116c0d0d56..52ff4307dd 100644
--- a/common/debug.cpp
+++ b/common/debug.cpp
@@ -22,6 +22,10 @@
* $Id$
*/
+// 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
+
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/util.h"
diff --git a/common/textconsole.cpp b/common/textconsole.cpp
index 0d0b0aead9..246a9a1fe1 100644
--- a/common/textconsole.cpp
+++ b/common/textconsole.cpp
@@ -22,14 +22,13 @@
* $Id$
*/
+// 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
+
#include "common/textconsole.h"
#include "common/system.h"
-#ifdef _WIN32_WCE
-// This is required for the debugger attachment
-extern bool isSmartphone();
-#endif
-
#ifdef __PLAYSTATION2__
// for those replaced fopen/fread/etc functions
#include "backends/platform/ps2/fileio.h"