Hide the ronin declaration of Timer to avoid conflict with the Timer class.

svn-id: r4932
This commit is contained in:
Marcus Comstedt 2002-09-13 14:36:07 +00:00
parent 095640be3d
commit ed17565f6c
3 changed files with 10 additions and 0 deletions

View File

@ -20,6 +20,8 @@
*
*/
#define RONIN_TIMER_ACCESS
#include <common/scummsys.h>
#include <common/stdafx.h>
#include <common/engine.h>

View File

@ -20,6 +20,8 @@
*
*/
#define RONIN_TIMER_ACCESS
#include <common/scummsys.h>
#include <common/stdafx.h>
#include <common/engine.h>

View File

@ -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