[Scummvm-cvs-logs] SF.net SVN: scummvm:[48361] scummvm/branches/branch-1-1-0/common

[fingolfin at users.sourceforge.net]

Revision: 48361
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48361&view=rev
Author:   fingolfin
Date:     2010-03-22 23:04:12 +0000 (Mon, 22 Mar 2010)

Log Message:
-----------
Backport r48280: COMMON: Move port specific '#define fputs' from util.cpp to textconsole.cpp

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/common/textconsole.cpp
    scummvm/branches/branch-1-1-0/common/util.cpp

Modified: scummvm/branches/branch-1-1-0/common/textconsole.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/common/textconsole.cpp	2010-03-22 23:03:09 UTC (rev 48360)
+++ scummvm/branches/branch-1-1-0/common/textconsole.cpp	2010-03-22 23:04:12 UTC (rev 48361)
@@ -25,6 +25,24 @@
 #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"
+
+	#define fputs(str, file)	ps2_fputs(str, file)
+#endif
+
+#ifdef __DS__
+	#include "backends/fs/ds/ds-fs.h"
+
+	#define fputs(str, file)	DS::std_fwrite(str, strlen(str), 1, file)
+#endif
+
 namespace Common {
 
 static OutputFormatter s_errorOutputFormatter = 0;

Modified: scummvm/branches/branch-1-1-0/common/util.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/common/util.cpp	2010-03-22 23:03:09 UTC (rev 48360)
+++ scummvm/branches/branch-1-1-0/common/util.cpp	2010-03-22 23:04:12 UTC (rev 48361)
@@ -28,24 +28,6 @@
 
 #include <stdarg.h>	// For va_list etc.
 
-#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"
-
-	#define fputs(str, file)	ps2_fputs(str, file)
-#endif
-
-#ifdef __DS__
-	#include "backends/fs/ds/ds-fs.h"
-
-	#define fputs(str, file)	DS::std_fwrite(str, strlen(str), 1, file)
-#endif
-
 namespace Common {
 
 StringTokenizer::StringTokenizer(const String &str, const String &delimiters) : _str(str), _delimiters(delimiters) {


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