summaryrefslogtreecommitdiff
path: root/deps/uv/src/unix
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2012-05-28 00:32:16 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2012-05-28 00:32:16 +0200
commit0fd28345392c2a16dfe143d2467ab14a236ce3c3 (patch)
tree01e5f95ddd008a4e8606c60d295123623f27398b /deps/uv/src/unix
parent1f3e4a76f9cb06fae57f7c81371cc5e1351a7977 (diff)
downloadnode-0fd28345392c2a16dfe143d2467ab14a236ce3c3.tar.gz
deps: upgrade libuv to 2ec0986
Diffstat (limited to 'deps/uv/src/unix')
-rw-r--r--deps/uv/src/unix/timer.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/deps/uv/src/unix/timer.c b/deps/uv/src/unix/timer.c
index 8463088ac..e50a35abc 100644
--- a/deps/uv/src/unix/timer.c
+++ b/deps/uv/src/unix/timer.c
@@ -52,11 +52,12 @@ int uv_timer_init(uv_loop_t* loop, uv_timer_t* timer) {
}
-int uv_timer_start(uv_timer_t* timer, uv_timer_cb cb, int64_t timeout,
- int64_t repeat) {
- if (uv__is_active(timer)) {
- return -1;
- }
+int uv_timer_start(uv_timer_t* timer,
+ uv_timer_cb cb,
+ int64_t timeout,
+ int64_t repeat) {
+ if (uv__is_active(timer))
+ uv_timer_stop(timer);
timer->timer_cb = cb;