--- IO-AIO/AIO.xs	2011/07/16 16:46:10	1.187
+++ IO-AIO/AIO.xs	2011/07/29 08:35:36	1.194
@@ -32,44 +32,45 @@
 
 #ifdef _WIN32
 
-# define EIO_STRUCT_DIRENT Direntry_t
-# undef malloc
-# undef free
-
-// perl overrides all those nice win32 functions
-# undef open
-# undef read
-# undef write
-# undef send
-# undef recv
-# undef lstat
-# undef truncate
-# undef ftruncate
-# undef open
-# undef link
-# undef close
-# undef unlink
-# undef mkdir
-# undef rmdir
-# undef rename
-# undef lseek
-# undef opendir
-# undef readdir
-# undef closedir
-# undef chmod
-# undef fchmod
-
-# define opendir(fd)     EIO_ERRNO (ENOSYS, 0)
-# define readdir(fd)     EIO_ENOSYS ()
-# define closedir(fd)    EIO_ENOSYS ()
+  // perl overrides all those nice libc functions
+
+  #undef malloc
+  #undef free
+  #undef open
+  #undef read
+  #undef write
+  #undef send
+  #undef recv
+  #undef stat
+  #undef lstat
+  #undef fstat
+  #undef truncate
+  #undef ftruncate
+  #undef open
+  #undef link
+  #undef close
+  #undef unlink
+  #undef mkdir
+  #undef rmdir
+  #undef rename
+  #undef lseek
+  #undef opendir
+  #undef readdir
+  #undef closedir
+  #undef chmod
+  #undef fchmod
+  #undef dup
+  #undef dup2
+  #undef abort
+  #undef pipe
 
 #else
 
-# include <sys/time.h>
-# include <sys/select.h>
-# include <unistd.h>
-# include <utime.h>
-# include <signal.h>
+  #include <sys/time.h>
+  #include <sys/select.h>
+  #include <unistd.h>
+  #include <utime.h>
+  #include <signal.h>
 
 #endif
 
@@ -116,6 +117,13 @@
 #include "libeio/config.h"
 #include "libeio/eio.h"
 
+static int req_invoke    (eio_req *req);
+#define EIO_FINISH(req)  req_invoke (req)
+static void req_destroy  (eio_req *grp);
+#define EIO_DESTROY(req) req_destroy (req)
+
+#include "libeio/eio.c"
+
 /* Linux/others */
 #ifndef O_ASYNC
 # define O_ASYNC 0
@@ -317,17 +325,10 @@
 # define PAGESIZE sysconf (_SC_PAGESIZE)
 #endif
 
-static int req_invoke    (eio_req *req);
-#define EIO_FINISH(req)  req_invoke (req)
-static void req_destroy  (eio_req *grp);
-#define EIO_DESTROY(req) req_destroy (req)
-
 enum {
   FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
 };
 
-#include "libeio/eio.c"
-
 typedef eio_req *aio_req;
 typedef eio_req *aio_req_ornot;
 
@@ -598,6 +599,7 @@
           case EIO_FSTAT:
             PL_laststype   = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
             PL_laststatval = req->result;
+            /* if compilation fails here then perl's Stat_t is not struct _stati64 */
             PL_statcache   = *(EIO_STRUCT_STAT *)(req->ptr2);
             PUSHs (sv_result);
             break;
@@ -659,8 +661,6 @@
 
 static void req_cancel_subs (aio_req grp)
 {
-  aio_req sub;
-
   if (grp->type != EIO_GROUP)
     return;
 
@@ -711,9 +711,13 @@
     }
 }
 
-static void atfork_child (void)
+static void ecb_cold
+reinit (void)
 {
   create_respipe ();
+
+  if (eio_init (want_poll, done_poll) < 0)
+    croak ("IO::AIO: unable to initialise eio library");
 }
 
 /*****************************************************************************/
@@ -916,21 +920,19 @@
   aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
   aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
 
-  for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
-    newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
+  for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
+    newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
 
   newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
 
-  create_respipe ();
-
-  if (eio_init (want_poll, done_poll) < 0)
-    croak ("IO::AIO: unable to initialise eio library");
-
-  /* atfork child called in fifo order, so before eio's handler */
-  X_THREAD_ATFORK (0, 0, atfork_child);
+  reinit ();
 }
 
 void
+reinit ()
+	PROTOTYPE:
+
+void
 max_poll_reqs (unsigned int nreqs)
 	PROTOTYPE: $
         CODE:
@@ -992,6 +994,7 @@
         ALIAS:
            aio_fsync     = EIO_FSYNC
            aio_fdatasync = EIO_FDATASYNC
+           aio_syncfs    = EIO_SYNCFS
 	PPCODE:
 {
   	int fd = s_fileno_croak (fh, 0);
@@ -1048,18 +1051,20 @@
 
         if (expect_false (close_fd < 0))
           {
-#ifdef _WIN32
-            close_fd = _open_osfhandle (socket (AF_INET, SOCK_STREAM, 0), 0);
-#else
             int pipefd [2];
 
-            if (pipe (pipefd) < 0
-                || close (pipefd [1]) < 0
-                || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
+            if (
+#ifdef _WIN32
+              _pipe (pipefd, 1, _O_BINARY) < 0
+#else
+              pipe (pipefd) < 0
+              || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
+#endif
+              || close (pipefd [1]) < 0
+            )
               abort (); /*D*/
 
             close_fd = pipefd [0];
-#endif
           }
 
         req->type = EIO_DUP2;
@@ -1130,7 +1135,6 @@
            aio_realpath = EIO_REALPATH
         PPCODE:
 {
-	SV *data;
         dREQ;
 
         req->type = ix;
@@ -1587,7 +1591,7 @@
 	OUTPUT:
         RETVAL
 
-ssize_t
+IV
 sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
         CODE:
         RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);