diff options
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 14 | ||||
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 12 | ||||
| -rw-r--r-- | common/textconsole.cpp | 4 |
3 files changed, 0 insertions, 30 deletions
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 50ab7e00b1..1fa1daf2df 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError() #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath() #include <bautils.h> @@ -53,19 +52,6 @@ ////////// extern "C" /////////////////////////////////////////////////// namespace Symbian { -// Show a simple Symbian Info win with Msg & exit -void FatalError(const char *msg) { - TPtrC8 msgPtr((const TUint8 *)msg); - TBuf<512> msg16Bit; - msg16Bit.Copy(msgPtr); -#ifdef S60 -#else - CEikonEnv::Static()->InfoWinL(_L("ScummVM Fatal Error"), msg16Bit); -#endif - if (g_system) - g_system->quit(); -} - // make this easily available everywhere char* GetExecutablePath() { return CSDLApp::GetExecutablePathCStr(); diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 6868faaa89..99e9107650 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -44,17 +44,6 @@ // hack in some tricks to work around not having these fcns for Symbian // and we _really_ don't wanna link with any other windows LIBC library! #if defined(__GCC32__) - - FIXME: If the following macros are ever used, then this will lead - to serious errors, e.g. an almost guaranteed buffer overflow - in Common::String::format(). Do *NOT* re-#define vsnprintf to - vsprintf, it will lead to disaster! - This shouldn't be necessary anyway, since we have - backends/platform/symbian/src/vsnprintf.h - - #define snprintf(buf,len,args...) sprintf(buf,args) - #define vsnprintf(buf,len,format,valist) vsprintf(buf,format,valist) - // taken from public domain http://www.opensource.apple.com/darwinsource/WWDC2004/gcc_legacy-939/gcc/floatlib.c #define SIGNBIT 0x80000000 #define HIDDEN (1 << 23) @@ -144,7 +133,6 @@ void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size // we cannot include SymbianOS.h everywhere, but this works too (functions code is in SymbianOS.cpp) namespace Symbian { -extern void FatalError(const char *msg); extern char* GetExecutablePath(); } #endif diff --git a/common/textconsole.cpp b/common/textconsole.cpp index 866128e2e2..4602b3be8d 100644 --- a/common/textconsole.cpp +++ b/common/textconsole.cpp @@ -95,10 +95,6 @@ void NORETURN_PRE error(const char *s, ...) { if (Common::s_errorHandler) (*Common::s_errorHandler)(buf_output); -#ifdef __SYMBIAN32__ - Symbian::FatalError(buf_output); -#endif - if (g_system) g_system->fatalError(); |