libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 16:35:20 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SYMBIAN : Remove Symbian FatalError implementation (not really used anymore for any current symbian phone)

Browse Source 
svn-id: r54372
This commit is contained in:
Lars Persson 2010-11-19 12:49:33 +00:00
parent 714263d5e9
commit 824a4009c9
3 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backends/platform/symbian/src/SymbianOS.cpp
View File

@ -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();

12
backends/platform/symbian/src/portdefs.h
View File

@ -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

4
common/textconsole.cpp
View File

@ -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();