diff options
| author | Neeraj Kumar | 2010-08-06 20:13:41 +0000 |
|---|---|---|
| committer | Neeraj Kumar | 2010-08-06 20:13:41 +0000 |
| commit | 7e126ed299cb789340cb2f8d409338dbdd6c8235 (patch) | |
| tree | 91f6e4be633fd579922ddf270443011582b8f9ec /common/textconsole.cpp | |
| parent | 6c0855f3d3efc52478ba9ce019fbd4c9287f4691 (diff) | |
| parent | 4ae7427eed781613e2cda096d0f61c77883bca05 (diff) | |
| download | scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.gz scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.bz2 scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.zip | |
TESTBED: Merged changes from trunk to my branch
svn-id: r51798
Diffstat (limited to 'common/textconsole.cpp')
| -rw-r--r-- | common/textconsole.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/common/textconsole.cpp b/common/textconsole.cpp index 87ba55ebf1..0d0b0aead9 100644 --- a/common/textconsole.cpp +++ b/common/textconsole.cpp @@ -47,6 +47,10 @@ extern bool isSmartphone(); #include <android/log.h> #endif +#ifdef __PSP__ + #include "backends/platform/psp/trace.h" +#endif + namespace Common { static OutputFormatter s_errorOutputFormatter = 0; @@ -151,14 +155,14 @@ void NORETURN_PRE error(const char *s, ...) { __android_log_assert("Fatal error", "ScummVM", "%s", buf_output); #endif -#ifdef PALMOS_MODE - extern void PalmFatalError(const char *err); - PalmFatalError(buf_output); -#endif - #ifdef __SYMBIAN32__ Symbian::FatalError(buf_output); #endif + +#ifdef __PSP__ + PspDebugTrace(false, "%s", buf_output); // write to file +#endif + // Finally exit. quit() will terminate the program if g_system is present if (g_system) g_system->quit(); |