--- libev/ev_poll.c	2007/11/04 15:58:50	1.4
+++ libev/ev_poll.c	2007/11/06 00:10:04	1.7
@@ -42,6 +42,10 @@
 poll_modify (EV_P_ int fd, int oev, int nev)
 {
   int idx;
+
+  if (oev == nev)
+    return;
+
   array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init);
 
   idx = pollidxs [fd];
@@ -71,27 +75,28 @@
 static void
 poll_poll (EV_P_ ev_tstamp timeout)
 {
+  int i;
   int res = poll (polls, pollcnt, ceil (timeout * 1000.));
 
-  if (res > 0)
-    {
-      int 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)
-        );
-    }
-  else if (res < 0)
+  if (res < 0)
     {
       if (errno == EBADF)
         fd_ebadf (EV_A);
-      else if (errno == ENOMEM)
+      else if (errno == ENOMEM && !syserr_cb)
         fd_enomem (EV_A);
+      else if (errno != EINTR)
+        syserr ();
+
+      return;
     }
+
+  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)
+    );
 }
 
 static int
@@ -102,7 +107,7 @@
   method_poll   = poll_poll;
 
   pollidxs = 0; pollidxmax = 0;
-  polls    = 0; pollsmax   = 0; pollscnt = 0;
+  polls    = 0; pollmax    = 0; pollcnt = 0;
 
   return EVMETHOD_POLL;
 }
@@ -110,6 +115,6 @@
 static void
 poll_destroy (EV_P)
 {
-  free (pollidxs);
-  free (polls);
+  ev_free (pollidxs);
+  ev_free (polls);
 }