aboutsummaryrefslogtreecommitdiff
path: root/common/timer.cpp
diff options
context:
space:
mode:
authorRuediger Hanke2002-08-22 10:43:50 +0000
committerRuediger Hanke2002-08-22 10:43:50 +0000
commit31f6833f87da3af3c480d0b6e605c3565efef1d0 (patch)
tree18530341c2b5ed81fb767ec424add41a32c94039 /common/timer.cpp
parente0cfd49ef794cff5641dbca71ff3fa70c35fc738 (diff)
downloadscummvm-rg350-31f6833f87da3af3c480d0b6e605c3565efef1d0.tar.gz
scummvm-rg350-31f6833f87da3af3c480d0b6e605c3565efef1d0.tar.bz2
scummvm-rg350-31f6833f87da3af3c480d0b6e605c3565efef1d0.zip
Made MorphOS port use master makefile, few compilation fixes
svn-id: r4800
Diffstat (limited to 'common/timer.cpp')
-rw-r--r--common/timer.cpp3
1 files changed, 2 insertions, 1 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