aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-03-08 17:38:11 +0000
committerMax Horn2007-03-08 17:38:11 +0000
commita63c1cf3bdb512fda51bd837801ff9481a7f0ecc (patch)
treeb493250c0db32f4424dee1c72b09b9120e45aa21
parentd19adc0514d8a43f3a233649595c636d5c38b3d5 (diff)
downloadscummvm-rg350-a63c1cf3bdb512fda51bd837801ff9481a7f0ecc.tar.gz
scummvm-rg350-a63c1cf3bdb512fda51bd837801ff9481a7f0ecc.tar.bz2
scummvm-rg350-a63c1cf3bdb512fda51bd837801ff9481a7f0ecc.zip
Moved the printf #define for the NDS into scummsys.h (not sure if that suits your needs Neil, feel free to change it again if necessary)
svn-id: r26024
-rw-r--r--common/file.cpp2
-rw-r--r--common/scummsys.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/common/file.cpp b/common/file.cpp
index 6ac03dff12..df500c4c6b 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -100,7 +100,7 @@
#define fseek(handle, offset, whence) DS::std_fseek(handle, offset, whence)
#define clearerr(handle) DS::std_clearerr(handle)
- #define printf(fmt, ...) consolePrintf(fmt, ##__VA_ARGS__)
+ //#define printf(fmt, ...) consolePrintf(fmt, ##__VA_ARGS__)
//#define fprintf(file, fmt, ...) { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); }
//#define fflush(file) DS::std_fflush(file) // used in common/util.cpp
diff --git a/common/scummsys.h b/common/scummsys.h
index e758b82288..25a9ae9d0a 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -312,6 +312,8 @@
#define STRINGBUFLEN 256
+ #define printf(fmt, ...) consolePrintf(fmt, ##__VA_ARGS__)
+
#else
#error No system type defined