--- IO-AIO/AIO.xs	2008/05/13 18:50:27	1.121
+++ IO-AIO/AIO.xs	2008/05/13 19:35:16	1.122
@@ -88,6 +88,8 @@
   STRLEN stroffset;	\
   SV *self;
 
+#define EIO_NO_WRAPPERS 1
+
 #include "libeio/eio.h"
 
 static int req_invoke    (eio_req *req);
@@ -476,16 +478,7 @@
         newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
         newCONSTSUB (stash, "O_CREAT",  newSViv (O_CREAT));
         newCONSTSUB (stash, "O_TRUNC",  newSViv (O_TRUNC));
-#ifdef _WIN32
-        X_MUTEX_CHECK (wrklock);
-        X_MUTEX_CHECK (reslock);
-        X_MUTEX_CHECK (reqlock);
-        X_MUTEX_CHECK (reqwait);
-        X_MUTEX_CHECK (preadwritelock);
-        X_MUTEX_CHECK (readdirlock);
-
-	X_COND_CHECK  (reqwait);
-#else
+#ifndef _WIN32
         newCONSTSUB (stash, "S_IFIFO",  newSViv (S_IFIFO));
 #endif
 
@@ -1006,9 +999,7 @@
 nthreads()
 	PROTOTYPE:
 	CODE:
-        if (WORDACCESS_UNSAFE) X_LOCK   (wrklock);
-        RETVAL = started;
-        if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
+        RETVAL = eio_nthreads ();
 	OUTPUT:
 	RETVAL