From 31f6833f87da3af3c480d0b6e605c3565efef1d0 Mon Sep 17 00:00:00 2001
From: Ruediger Hanke
Date: Thu, 22 Aug 2002 10:43:50 +0000
Subject: Made MorphOS port use master makefile, few compilation fixes

svn-id: r4800
---
 common/timer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common/timer.cpp')

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
 
-- 
cgit v1.2.3