Merged revisions 32668-32669,32676,32687-32689,32693,32695,32698-32701,32705 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32720

1 files changed, 4 insertions, 0 deletions

diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 194a7b6889..64d429a83e 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -102,6 +102,7 @@ public:
 
 	virtual Common::SaveFileManager *getSavefileManager();
 	virtual Audio::Mixer *getMixer();
+	virtual void getTimeAndDate(struct tm &t) const;
 	virtual Common::TimerManager *getTimerManager();
 };
 
@@ -295,6 +296,9 @@ Common::TimerManager *OSystem_NULL::getTimerManager() {
 	return _timer;
 }
 
+void OSystem_NULL::getTimeAndDate(struct tm &t) const {
+}
+
 OSystem *OSystem_NULL_create() {
 	return new OSystem_NULL();
 }