From afe56a8ea8f30a61607310e8b971af63bc499f22 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 6 Dec 2013 04:22:44 +0100 Subject: NULL: Fix compilation of null backend. --- backends/platform/null/null.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'backends/platform') diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 9e05539799..29bf9acacd 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -20,12 +20,23 @@ * */ +// We use some stdio.h functionality here thus we need to allow some +// symbols. Alternatively, we could simply allow everything by defining +// FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE +#define FORBIDDEN_SYMBOL_EXCEPTION_stdout +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr +#define FORBIDDEN_SYMBOL_EXCEPTION_fputs + #include "backends/modular-backend.h" #include "base/main.h" #if defined(USE_NULL_DRIVER) #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" +#include "backends/events/default/default-events.h" +#include "backends/mutex/null/null-mutex.h" +#include "backends/graphics/null/null-graphics.h" #include "audio/mixer_intern.h" #include "common/scummsys.h" @@ -40,13 +51,14 @@ #include "backends/fs/windows/windows-fs-factory.h" #endif -class OSystem_NULL : public ModularBackend { +class OSystem_NULL : public ModularBackend, Common::EventSource { public: OSystem_NULL(); virtual ~OSystem_NULL(); virtual void initBackend(); + virtual Common::EventSource *getDefaultEventSource() { return this; } virtual bool pollEvent(Common::Event &event); virtual uint32 getMillis(bool skipRecord = false); @@ -92,7 +104,7 @@ bool OSystem_NULL::pollEvent(Common::Event &event) { return false; } -uint32 OSystem_NULL::getMillis() { +uint32 OSystem_NULL::getMillis(bool skipRecord) { return 0; } -- cgit v1.2.3