mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-19 00:15:30 +00:00
Hide the ronin declaration of Timer to avoid conflict with the Timer class.
svn-id: r4932
This commit is contained in:
parent
095640be3d
commit
ed17565f6c
@ -20,6 +20,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define RONIN_TIMER_ACCESS
|
||||
|
||||
#include <common/scummsys.h>
|
||||
#include <common/stdafx.h>
|
||||
#include <common/engine.h>
|
||||
|
@ -20,6 +20,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define RONIN_TIMER_ACCESS
|
||||
|
||||
#include <common/scummsys.h>
|
||||
#include <common/stdafx.h>
|
||||
#include <common/engine.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
|
||||
|
Loading…
x
Reference in New Issue
Block a user