diff options
| author | shennetsind <ind@henn.et> | 2013-05-16 13:31:11 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-05-16 13:31:11 -0300 |
| commit | 4424ef2ce2cd65666145a0a0c6ba8d05669f1fb8 (patch) | |
| tree | 1b4057b55cb3a5b76b4b06f043a193b4ad95e8aa | |
| parent | 84cd1ff926e99abd3689729fb008f2bd020ccba1 (diff) | |
| download | hercules-4424ef2ce2cd65666145a0a0c6ba8d05669f1fb8.tar.gz hercules-4424ef2ce2cd65666145a0a0c6ba8d05669f1fb8.tar.bz2 hercules-4424ef2ce2cd65666145a0a0c6ba8d05669f1fb8.tar.xz hercules-4424ef2ce2cd65666145a0a0c6ba8d05669f1fb8.zip | |
Fixed Bug #7249
System-dependent function name conflict solved.
http://hercules.ws/board/tracker/issue-7249-error-compiling-timerc/
Signed-off-by: shennetsind <ind@henn.et>
| -rw-r--r-- | src/common/timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/timer.c b/src/common/timer.c index 1ea1a0d1c..edb46bd71 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -281,13 +281,13 @@ const struct TimerData* timer_get(int tid) { /// Marks a timer specified by 'id' for immediate deletion once it expires. /// Param 'func' is used for debug/verification purposes. /// Returns 0 on success, < 0 on failure. -int timer_delete(int tid, TimerFunc func) { +int timer_do_delete(int tid, TimerFunc func) { if( tid < 0 || tid >= timer_data_num ) { - ShowError("timer_delete error : no such timer %d (%p(%s))\n", tid, func, search_timer_func_list(func)); + ShowError("timer_do_delete error : no such timer %d (%p(%s))\n", tid, func, search_timer_func_list(func)); return -1; } if( timer_data[tid].func != func ) { - ShowError("timer_delete error : function mismatch %p(%s) != %p(%s)\n", timer_data[tid].func, search_timer_func_list(timer_data[tid].func), func, search_timer_func_list(func)); + ShowError("timer_do_delete error : function mismatch %p(%s) != %p(%s)\n", timer_data[tid].func, search_timer_func_list(timer_data[tid].func), func, search_timer_func_list(func)); return -2; } @@ -416,7 +416,7 @@ void timer_defaults(void) { add_timer_interval = timer_add_interval; add_timer_func_list = timer_add_func_list; get_timer = timer_get; - delete_timer = timer_delete; + delete_timer = timer_do_delete; addtick_timer = timer_addtick; settick_timer = timer_settick; get_uptime = timer_get_uptime; |