--- IO-AIO/AIO.xs	2008/05/17 12:17:25	1.123
+++ IO-AIO/AIO.xs	2008/06/19 09:05:43	1.125
@@ -67,6 +67,12 @@
 
 #endif
 
+/* perl stupidly overrides readdir and maybe others */
+/* with thread-unsafe versions, imagine that :( */
+#undef readdir
+#undef opendir
+#undef closedir
+
 #define EIO_STRUCT_STAT Stat_t
 
 /* use NV for 32 bit perls as it allows larger offsets */
@@ -425,18 +431,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)