diff options
Diffstat (limited to 'backends/platform/symbian/src')
| -rw-r--r-- | backends/platform/symbian/src/SymbianMain.cpp (renamed from backends/platform/symbian/src/Symbianmain.cpp) | 5 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 19 | ||||
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 6 |
3 files changed, 9 insertions, 21 deletions
diff --git a/backends/platform/symbian/src/Symbianmain.cpp b/backends/platform/symbian/src/SymbianMain.cpp index 4aaa05926f..9e300a3068 100644 --- a/backends/platform/symbian/src/Symbianmain.cpp +++ b/backends/platform/symbian/src/SymbianMain.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/Symbianmain.cpp $ + * $Id: Symbianmain.cpp 51588 2010-08-01 19:51:23Z anotherguest $ * */ @@ -96,4 +96,3 @@ int main(int argc, char *argv[]) { return res; } - diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index d86adbf354..faced0c2c4 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -22,14 +22,18 @@ * $Id$ */ -#include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError() #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath() #include <bautils.h> +#include <eikenv.h> // for CEikonEnv::Static() +#define FORBIDDEN_SYMBOL_EXCEPTION_fclose +#define FORBIDDEN_SYMBOL_EXCEPTION_fopen #include "backends/platform/symbian/src/SymbianOS.h" #include "backends/platform/symbian/src/SymbianActions.h" #include "common/config-manager.h" #include "common/scummsys.h" +#include "common/translation.h" + #include "gui/message.h" #include "backends/fs/symbian/symbian-fs-factory.h" @@ -44,18 +48,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); -#ifndef S60 - 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(); @@ -168,6 +160,7 @@ void OSystem_SDL_Symbian::checkMappings() { GUI::Actions::Instance()->initInstanceGame(); } +// make sure we always go to normal, even if the string might be set wrong! bool OSystem_SDL_Symbian::setGraphicsMode(const char * /*name*/) { return _graphicsManager->setGraphicsMode(0); } diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 2a26771a0a..c45bac4933 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -44,10 +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__) - - #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) @@ -134,10 +130,10 @@ // Symbian bsearch implementation is flawed void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)); #define bsearch scumm_bsearch +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE // 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 |