From ed17565f6cd44380b4142ef5647a3a943659e970 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Fri, 13 Sep 2002 14:36:07 +0000
Subject: Hide the ronin declaration of Timer to avoid conflict with the Timer
 class.

svn-id: r4932
---
 backends/dc/dcmain.cpp | 2 ++
 backends/dc/input.cpp  | 2 ++
 backends/dc/portdefs.h | 6 ++++++
 3 files changed, 10 insertions(+)

(limited to 'backends/dc')

diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp
index 85bc247581..7217b59f7f 100644
--- a/backends/dc/dcmain.cpp
+++ b/backends/dc/dcmain.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#define RONIN_TIMER_ACCESS
+
 #include <common/scummsys.h>
 #include <common/stdafx.h>
 #include <common/engine.h>
diff --git a/backends/dc/input.cpp b/backends/dc/input.cpp
index f31a7ffc8e..7e271d264b 100644
--- a/backends/dc/input.cpp
+++ b/backends/dc/input.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#define RONIN_TIMER_ACCESS
+
 #include <common/scummsys.h>
 #include <common/stdafx.h>
 #include <common/engine.h>
diff --git a/backends/dc/portdefs.h b/backends/dc/portdefs.h
index fd7929ffe7..67e0e9b275 100644
--- a/backends/dc/portdefs.h
+++ b/backends/dc/portdefs.h
@@ -6,4 +6,10 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>
+#ifndef RONIN_TIMER_ACCESS
+#define Timer ronin_Timer
+#endif
 #include <ronin/ronin.h>
+#ifdef Timer
+#undef Timer
+#endif
-- 
cgit v1.2.3