Skip to content

Commit

Permalink
NULL: Fix compilation of null backend.
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Schickel committed Dec 6, 2013
1 parent 580bfc2 commit afe56a8
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions backends/platform/null/null.cpp
Expand Up @@ -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"

Expand All @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit afe56a8

Please sign in to comment.