[Scummvm-cvs-logs] CVS: scummvm/backends/dc dcmain.cpp,1.2,1.3 input.cpp,1.2,1.3 portdefs.h,1.1.1.1,1.2

[Marcus Comstedt]

Update of /cvsroot/scummvm/scummvm/backends/dc
In directory usw-pr-cvs1:/tmp/cvs-serv30041

Modified Files:
	dcmain.cpp input.cpp portdefs.h 
Log Message:
Hide the ronin declaration of Timer to avoid conflict with the Timer class.

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dcmain.cpp	13 Sep 2002 14:27:03 -0000	1.2
+++ dcmain.cpp	13 Sep 2002 14:36:07 -0000	1.3
@@ -20,6 +20,8 @@
  *
  */
 
+#define RONIN_TIMER_ACCESS
+
 #include <common/scummsys.h>
 #include <common/stdafx.h>
 #include <common/engine.h>

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.cpp	13 Sep 2002 14:27:03 -0000	1.2
+++ input.cpp	13 Sep 2002 14:36:07 -0000	1.3
@@ -20,6 +20,8 @@
  *
  */
 
+#define RONIN_TIMER_ACCESS
+
 #include <common/scummsys.h>
 #include <common/stdafx.h>
 #include <common/engine.h>

Index: portdefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/portdefs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- portdefs.h	21 Aug 2002 16:07:09 -0000	1.1.1.1
+++ portdefs.h	13 Sep 2002 14:36:07 -0000	1.2
@@ -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