From d792665ddfc14bef596bb3832648570eed11b4df Mon Sep 17 00:00:00 2001
From: root <root>
Date: Mon, 10 Jan 2011 14:05:23 +0000
Subject: *** empty log message ***

---
 ev_epoll.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ev_epoll.c')

diff --git a/ev_epoll.c b/ev_epoll.c
index eb22ad8..d0caa93 100644
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -143,11 +143,12 @@ epoll_poll (EV_P_ ev_tstamp timeout)
 {
   int i;
   int eventcnt;
-  
+
   /* 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, (int)ceil (timeout * 1000.));
+  eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax,
+                         epoll_epermcnt ? 0 : (int)ceil (timeout * 1000.));
   EV_ACQUIRE_CB;
 
   if (expect_false (eventcnt < 0))
-- 
cgit v1.2.3