--- IO-AIO/AIO.xs	2008/05/13 19:35:16	1.122
+++ IO-AIO/AIO.xs	2008/05/29 03:20:40	1.124
@@ -414,7 +414,7 @@
       if (size)
         return;
 
-      maybe_start_thread ();
+      etp_maybe_start_thread ();
 
       FD_ZERO (&rfd);
       FD_SET (respipe [0], &rfd);
@@ -425,18 +425,18 @@
 
 static int poll_cb (void)
 {
-  int res;
-
-  do 
+  for (;;)
     {
-      res = eio_poll ();
+      int res = eio_poll ();
 
       if (res > 0)
         croak (0);
-    }
-  while (max_outstanding && max_outstanding <= eio_nreqs ());
 
-  return res;
+      if (!max_outstanding || max_outstanding > eio_nreqs ())
+        return res;
+
+      poll_wait ();
+    }
 }
 
 static void atfork_child (void)