--- IO-AIO/AIO.xs	2009/07/01 08:11:24	1.150
+++ IO-AIO/AIO.xs	2009/07/14 00:13:36	1.151
@@ -6,6 +6,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#include "schmorp.h"
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -571,17 +573,6 @@
   if (GIMME_V != G_VOID)					\
     XPUSHs (req_sv (req, AIO_REQ_KLASS));
 
-static int
-extract_fd (SV *fh, int wr)
-{
-  int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
-
-  if (fd < 0)
-    croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
-
-  return fd;
-}
-
 MODULE = IO::AIO                PACKAGE = IO::AIO
 
 PROTOTYPES: ENABLE
@@ -704,7 +695,7 @@
            aio_fdatasync = EIO_FDATASYNC
 	PPCODE:
 {
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
         dREQ;
 
         req->type = ix;
@@ -719,7 +710,7 @@
 	PROTOTYPE: $$$$;$
 	PPCODE:
 {
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
         dREQ;
 
         req->type = EIO_SYNC_FILE_RANGE;
@@ -738,7 +729,7 @@
 	PPCODE:
 {
         static int close_pipe = -1; /* dummy fd to close fds via dup2 */
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
         dREQ;
 
         if (close_pipe < 0)
@@ -770,7 +761,7 @@
         PPCODE:
 {
         STRLEN svlen;
-        int fd = extract_fd (fh, ix == EIO_WRITE);
+        int fd = s_fileno_croak (fh, ix == EIO_WRITE);
         char *svptr = SvPVbyte (data, svlen);
         UV len = SvUV (length);
 
@@ -835,8 +826,8 @@
 	PROTOTYPE: $$$$;$
         PPCODE:
 {
-  	int ifd = extract_fd (in_fh , 0);
-  	int ofd = extract_fd (out_fh, 0);
+  	int ifd = s_fileno_croak (in_fh , 0);
+  	int ofd = s_fileno_croak (out_fh, 1);
 	dREQ;
 
         req->type = EIO_SENDFILE;
@@ -855,7 +846,7 @@
 	PROTOTYPE: $$$;$
         PPCODE:
 {
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
 	dREQ;
 
         req->type = EIO_READAHEAD;