diff options
| author | Max Horn | 2009-11-23 22:29:39 +0000 |
|---|---|---|
| committer | Max Horn | 2009-11-23 22:29:39 +0000 |
| commit | 3d342bec3c099039efe2452b08ea525002eac7b2 (patch) | |
| tree | ac14cb008910caf655ab310d5e930880daaeafa2 /common/util.cpp | |
| parent | f3c6e07feb97d6d7946ebaab0d27407722ca30af (diff) | |
| download | scummvm-rg350-3d342bec3c099039efe2452b08ea525002eac7b2.tar.gz scummvm-rg350-3d342bec3c099039efe2452b08ea525002eac7b2.tar.bz2 scummvm-rg350-3d342bec3c099039efe2452b08ea525002eac7b2.zip | |
PS2 & NDS: Remove ps2_fprintf and some useless typedefs and #defines; use fputs instead of fprintf
svn-id: r46107
Diffstat (limited to 'common/util.cpp')
| -rw-r--r-- | common/util.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/common/util.cpp b/common/util.cpp index c16e774e43..5e4ee2b2c7 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -37,24 +37,15 @@ extern bool isSmartphone(); #ifdef __PLAYSTATION2__ // for those replaced fopen/fread/etc functions - typedef unsigned long uint64; - typedef signed long int64; #include "backends/platform/ps2/fileio.h" - #define fprintf ps2_fprintf #define fputs(str, file) ps2_fputs(str, file) - #define fflush(a) ps2_fflush(a) #endif #ifdef __DS__ #include "backends/fs/ds/ds-fs.h" - void std_fprintf(FILE* handle, const char* fmt, ...); - void std_fflush(FILE* handle); - - #define fprintf(file, fmt, ...) do { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); } while(0) - #define fputs(str, file) DS::std_fwrite(str, strlen(str), 1, file) - #define fflush(file) DS::std_fflush(file) + #define fputs(str, file) DS::std_fwrite(str, strlen(str), 1, file) #endif @@ -444,7 +435,9 @@ void warning(const char *s, ...) { va_end(va); #if !defined (__SYMBIAN32__) - fprintf(stderr, "WARNING: %s!\n", buf); + fputs("WARNING: ", stderr); + fputs(buf, stderr); + fputs("!\n", stderr); #endif #if defined( USE_WINDBG ) |