From 6c5f50c246062bcb50a20efe7951be7e23449ca0 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 23 May 2011 19:20:56 +0200 Subject: COMMON: Add exit() to list of forbidden symbols --- backends/modular-backend.cpp | 6 ++++++ backends/modular-backend.h | 3 +-- backends/platform/sdl/sdl.cpp | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'backends') diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp index fe3991af65..c5f147ffe1 100644 --- a/backends/modular-backend.cpp +++ b/backends/modular-backend.cpp @@ -20,6 +20,8 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_exit + #include "backends/modular-backend.h" #include "backends/fs/fs-factory.h" @@ -277,3 +279,7 @@ FilesystemFactory *ModularBackend::getFilesystemFactory() { assert(_fsFactory); return _fsFactory; } + +void ModularBackend::quit() { + exit(0); +} diff --git a/backends/modular-backend.h b/backends/modular-backend.h index 43148b6e4a..e46fbfdd21 100644 --- a/backends/modular-backend.h +++ b/backends/modular-backend.h @@ -148,8 +148,7 @@ public: virtual Common::SaveFileManager *getSavefileManager(); virtual FilesystemFactory *getFilesystemFactory(); - virtual void quit() { exit(0); } - virtual void setWindowCaption(const char *caption) {} + virtual void quit(); virtual void displayMessageOnOSD(const char *msg); //@} diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 5cb409794b..a3fb719ca4 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -21,6 +21,7 @@ */ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h +#define FORBIDDEN_SYMBOL_EXCEPTION_exit #ifdef WIN32 #define WIN32_LEAN_AND_MEAN -- cgit v1.2.3