*** empty log message ***

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index d0b72998377047e500e836c05008b9785b18353c..726a45bce36697b48b0477d68d1bbb974beddfbd 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -53,7 +53,7 @@ poll_modify (EV_P_ int fd, int oev, int nev)
   if (idx < 0) /* need to allocate a new pollfd */
     {
       pollidxs [fd] = idx = pollcnt++;
   if (idx < 0) /* need to allocate a new pollfd */
     {
       pollidxs [fd] = idx = pollcnt++;

-      array_needsize (struct pollfd, polls, pollmax, pollcnt, );
+      array_needsize (struct pollfd, polls, pollmax, pollcnt, (void));

       polls [idx].fd = fd;
     }
 
       polls [idx].fd = fd;
     }
 


@@ -94,12 +94,15 @@ poll_poll (EV_P_ ev_tstamp timeout)
     }
 
   for (i = 0; i < pollcnt; ++i)
     }
 
   for (i = 0; i < pollcnt; ++i)

-    fd_event (
-      EV_A_
-      polls [i].fd,
-      (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
-      | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
-    );
+    if (polls [i].revents & POLLNVAL)
+      fd_kill (EV_A_ polls [i].fd);
+    else
+      fd_event (
+        EV_A_
+        polls [i].fd,
+        (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
+        | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
+      );

 }
 
 static int
 }
 
 static int