From 436d5d174bfb936c4852a63eb03e0a3185f1502a Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sat, 4 Jun 2011 05:25:02 +0000
Subject: *** empty log message ***

---
 ev_epoll.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ev_epoll.c')

diff --git a/ev_epoll.c b/ev_epoll.c
index 1b8a3e9..c8448da 100644
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -144,11 +144,13 @@ epoll_poll (EV_P_ ev_tstamp timeout)
   int i;
   int eventcnt;
 
+  if (expect_false (epoll_epermcnt))
+    timeout = 0.;
+
   /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */
   /* the default libev max wait time, however. */
   EV_RELEASE_CB;
-  eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax,
-                         epoll_epermcnt ? 0 : ev_timeout_to_ms (timeout));
+  eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, timeout * 1e3);
   EV_ACQUIRE_CB;
 
   if (expect_false (eventcnt < 0))
-- 
cgit v1.2.3