diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-11-28 17:43:20 +0100 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 13:54:59 +0100 |
commit | a6f79ca57f0b4b296f67c2d063fd85a627b611b8 (patch) | |
tree | e8164505077da6b3039d598b6b22b6a893dfccd6 /sysdep/unix/io.c | |
parent | 574b2324275d3292e98a8e329f791eb5c799f7f2 (diff) |
Timers: Revert temporary names and remove old timer.h
Diffstat (limited to 'sysdep/unix/io.c')
-rw-r--r-- | sysdep/unix/io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index a196bbe2..7492e031 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -34,7 +34,6 @@ #include "nest/bird.h" #include "lib/lists.h" #include "lib/resource.h" -#include "sysdep/unix/timer.h" #include "lib/socket.h" #include "lib/event.h" #include "lib/timer.h" @@ -2143,7 +2142,7 @@ io_loop(void) { int poll_tout, timeout; int nfds, events, pout; - timer2 *t; + timer *t; sock *s; node *n; int fdmax = 256; @@ -2162,7 +2161,7 @@ io_loop(void) if (t = timers_first(&main_timeloop)) { times_update(&main_timeloop); - timeout = (tm2_remains(t) TO_MS) + 1; + timeout = (tm_remains(t) TO_MS) + 1; poll_tout = MIN(poll_tout, timeout); } |