[Scummvm-cvs-logs] SF.net SVN: scummvm:[53989] scummvm/trunk/common

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Oct 31 22:49:53 CET 2010


Revision: 53989
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53989&view=rev
Author:   fingolfin
Date:     2010-10-31 21:49:53 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
COMMON: Allow forbidden symbols in debug.cpp and textconsole.cpp

This is currently necessary for the PS2 port and possibly others.

Modified Paths:
--------------
    scummvm/trunk/common/debug.cpp
    scummvm/trunk/common/textconsole.cpp

Modified: scummvm/trunk/common/debug.cpp
===================================================================
--- scummvm/trunk/common/debug.cpp	2010-10-31 21:47:20 UTC (rev 53988)
+++ scummvm/trunk/common/debug.cpp	2010-10-31 21:49:53 UTC (rev 53989)
@@ -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"

Modified: scummvm/trunk/common/textconsole.cpp
===================================================================
--- scummvm/trunk/common/textconsole.cpp	2010-10-31 21:47:20 UTC (rev 53988)
+++ scummvm/trunk/common/textconsole.cpp	2010-10-31 21:49:53 UTC (rev 53989)
@@ -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"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list