summaryrefslogtreecommitdiff
path: root/src/common/timer.h
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 21:34:31 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 21:34:31 +0000
commitbc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8 (patch)
tree3aa7da07fc43116707de469034c7cf8186e8b2d5 /src/common/timer.h
parentb21c980c03ea476e324c714a9ad2d5eff5cb981d (diff)
downloadhercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.gz
hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.bz2
hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.xz
hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.zip
* Changed the data field of timers from int to intptr.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12633 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/timer.h')
-rw-r--r--src/common/timer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/timer.h b/src/common/timer.h
index 9c9d5c2b1..7a3dba4a8 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -19,7 +19,7 @@
// Struct declaration
-typedef int (*TimerFunc)(int tid, unsigned int tick, int id, int data);
+typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr data);
struct TimerData {
unsigned int tick;
@@ -30,7 +30,7 @@ struct TimerData {
// general-purpose storage
int id;
- int data;
+ intptr data;
};
// Function prototype declaration
@@ -38,8 +38,8 @@ struct TimerData {
unsigned int gettick(void);
unsigned int gettick_nocache(void);
-int add_timer(unsigned int tick, TimerFunc func, int id, int data);
-int add_timer_interval(unsigned int tick, TimerFunc func, int id, int data, int interval);
+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);
struct TimerData* get_timer(int tid);
int delete_timer(int tid, TimerFunc func);