--- IO-AIO/AIO.xs	2006/10/31 00:32:19	1.90
+++ IO-AIO/AIO.xs	2006/11/08 02:01:02	1.93
@@ -449,10 +449,9 @@
               call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
               SPAGAIN;
 
-              fh = SvREFCNT_inc (POPs);
-
+              fh = POPs;
               PUSHMARK (SP);
-              XPUSHs (sv_2mortal (fh));
+              XPUSHs (fh);
             }
             break;
 
@@ -1646,18 +1645,17 @@
         while (nreqs)
           {
             poll_wait ();
-            poll_cb (0);
+            poll_cb ();
           }
 
-void
+int
 poll()
 	PROTOTYPE:
 	CODE:
-        if (nreqs)
-          {
-            poll_wait ();
-            poll_cb (0);
-          }
+        poll_wait ();
+        RETVAL = poll_cb ();
+	OUTPUT:
+	RETVAL
 
 int
 poll_fileno()
@@ -1679,8 +1677,7 @@
 poll_wait()
 	PROTOTYPE:
 	CODE:
-        if (nreqs)
-          poll_wait ();
+        poll_wait ();
 
 int
 nreqs()