aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/timer.cpp3
-rw-r--r--common/timer.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/common/timer.cpp b/common/timer.cpp
index 2a3fc74024..7ca8f4c1a2 100644
--- a/common/timer.cpp
+++ b/common/timer.cpp
@@ -23,6 +23,7 @@
#include "scummsys.h"
#include "timer.h"
+#ifndef __MORPHOS__
static Scumm * scumm;
Timer::Timer(Scumm * parent) {
@@ -153,5 +154,5 @@ void Timer::releaseProcedure (TimerProc procedure) {
}
_timerRunning = true;
}
-
+#endif
diff --git a/common/timer.h b/common/timer.h
index a4f4c7080d..789714cb7a 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -28,7 +28,7 @@
typedef void (*TimerProc)(Scumm *);
#ifdef __MORPHOS__
-#include "morphos/morphos_timer.h"
+#include "morphos_timer.h"
#else
class OSystem;