diff options
Diffstat (limited to 'src/common/timer.h')
| -rw-r--r-- | src/common/timer.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/common/timer.h b/src/common/timer.h index 354a71113..a615a5874 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -4,9 +4,7 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif #define DIFF_TICK(a,b) ((int)((a)-(b))) @@ -19,7 +17,7 @@ // Struct declaration -typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr data); +typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr_t data); struct TimerData { unsigned int tick; @@ -30,7 +28,7 @@ struct TimerData { // general-purpose storage int id; - intptr data; + intptr_t data; }; // Function prototype declaration @@ -38,8 +36,8 @@ struct TimerData { unsigned int gettick(void); unsigned int gettick_nocache(void); -int add_timer(unsigned int tick, TimerFunc func, int id, intptr data); -int add_timer_interval(unsigned int tick, TimerFunc func, int id, intptr data, int interval); +int add_timer(unsigned int tick, TimerFunc func, int id, intptr_t data); +int add_timer_interval(unsigned int tick, TimerFunc func, int id, intptr_t data, int interval); const struct TimerData* get_timer(int tid); int delete_timer(int tid, TimerFunc func); |