diff options
author | shenhuyong <shenhuyong@hotmail.com> | 2013-10-03 14:26:16 +0800 |
---|---|---|
committer | shenhuyong <shenhuyong@hotmail.com> | 2013-10-03 14:26:16 +0800 |
commit | d153854f32c4fd9265010e6936db49e23137db08 (patch) | |
tree | 7b389a5693d5003e88880ce7bfb9d5500551ebb4 /src/common/timer.h | |
parent | ea84a19426cd401615421ee3f3d2eff2d741beb7 (diff) | |
parent | 2f2afbd3b63a75695f8f96e3bcb4db9fff5a7dc6 (diff) | |
download | hercules-d153854f32c4fd9265010e6936db49e23137db08.tar.gz hercules-d153854f32c4fd9265010e6936db49e23137db08.tar.bz2 hercules-d153854f32c4fd9265010e6936db49e23137db08.tar.xz hercules-d153854f32c4fd9265010e6936db49e23137db08.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common/timer.h')
-rw-r--r-- | src/common/timer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/timer.h b/src/common/timer.h index 3146a2e66..600f9fd02 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -23,9 +23,8 @@ typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr_t data); struct TimerData { unsigned int tick; TimerFunc func; - int type; + unsigned char type; int interval; - int heap_pos; // general-purpose storage int id; |