diff options
author | Cameron Cawley | 2019-11-05 22:19:47 +0000 |
---|---|---|
committer | Filippos Karapetis | 2019-12-01 01:04:06 +0200 |
commit | 48615cb83e1889166503b9d3bef7c50203cc441a (patch) | |
tree | 9c0a4d9e0e7252015c31ae6b815089a12ab730de /backends/platform | |
parent | aee09409e8b30dbd8ea10c9190b85037fe8458c9 (diff) | |
download | scummvm-rg350-48615cb83e1889166503b9d3bef7c50203cc441a.tar.gz scummvm-rg350-48615cb83e1889166503b9d3bef7c50203cc441a.tar.bz2 scummvm-rg350-48615cb83e1889166503b9d3bef7c50203cc441a.zip |
BACKENDS: Move implementation of OSystem::quit() out of ModularBackend
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/null/null.cpp | 7 | ||||
-rw-r--r-- | backends/platform/tizen/system.cpp | 6 | ||||
-rw-r--r-- | backends/platform/tizen/system.h | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 6261212f5f..4117982737 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -27,6 +27,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_stdout #define FORBIDDEN_SYMBOL_EXCEPTION_stderr #define FORBIDDEN_SYMBOL_EXCEPTION_fputs +#define FORBIDDEN_SYMBOL_EXCEPTION_exit #include "backends/modular-backend.h" #include "base/main.h" @@ -67,6 +68,8 @@ public: virtual void delayMillis(uint msecs); virtual void getTimeAndDate(TimeDate &t) const {} + virtual void quit(); + virtual void logMessage(LogMessageType::Type type, const char *message); }; @@ -115,6 +118,10 @@ uint32 OSystem_NULL::getMillis(bool skipRecord) { void OSystem_NULL::delayMillis(uint msecs) { } +void OSystem_NULL::quit() { + exit(0); +} + void OSystem_NULL::logMessage(LogMessageType::Type type, const char *message) { FILE *output = 0; diff --git a/backends/platform/tizen/system.cpp b/backends/platform/tizen/system.cpp index 23b07187bb..7fe45f574e 100644 --- a/backends/platform/tizen/system.cpp +++ b/backends/platform/tizen/system.cpp @@ -20,6 +20,8 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_exit + #include <FUiCtrlMessageBox.h> #include <FLocales.h> @@ -454,6 +456,10 @@ void TizenSystem::exitSystem() { } } +void TizenSystem::quit() { + exit(0); +} + void TizenSystem::logMessage(LogMessageType::Type type, const char *message) { if (type == LogMessageType::kError) { systemError(message); diff --git a/backends/platform/tizen/system.h b/backends/platform/tizen/system.h index 3f668baf34..f788280ba4 100644 --- a/backends/platform/tizen/system.h +++ b/backends/platform/tizen/system.h @@ -86,6 +86,7 @@ private: void delayMillis(uint msecs); void getTimeAndDate(TimeDate &t) const; void fatalError(); + void quit(); void logMessage(LogMessageType::Type type, const char *message); void addSysArchivesToSearchSet(Common::SearchSet &s, int priority); |