--- IO-AIO/AIO.xs	2010/12/01 04:43:12	1.175
+++ IO-AIO/AIO.xs	2011/05/19 22:57:04	1.182
@@ -18,7 +18,7 @@
 #include <fcntl.h>
 #include <sched.h>
 
-#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES
+#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
 # include <sys/mman.h>
 #endif
 
@@ -120,8 +120,55 @@
 
 #define EIO_NO_WRAPPERS 1
 
+#include "libeio/config.h"
 #include "libeio/eio.h"
 
+/* Linux/others */
+#ifndef O_ASYNC
+# define O_ASYNC 0
+#endif
+#ifndef O_DIRECT
+# define O_DIRECT 0
+#endif
+#ifndef O_NOATIME
+# define O_NOATIME 0
+#endif
+
+/* POSIX */
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+#ifndef O_NOCTTY
+# define O_NOCTTY 0
+#endif
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#endif
+#ifndef O_EXEC
+# define O_EXEC 0
+#endif
+#ifndef O_SEARCH
+# define O_SEARCH 0
+#endif
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+#ifndef O_DSYNC
+# define O_DSYNC 0
+#endif
+#ifndef O_RSYNC
+# define O_RSYNC 0
+#endif
+#ifndef O_SYNC
+# define O_SYNC 0
+#endif
+#ifndef O_TTY_INIT
+# define O_TTY_INIT 0
+#endif
+
 #ifndef POSIX_FADV_NORMAL
 # define POSIX_FADV_NORMAL 0
 #endif
@@ -209,6 +256,31 @@
 # define ST_RELATIME    0
 #endif
 
+#ifndef S_IFIFO
+# define S_IFIFO	0
+#endif
+#ifndef S_IFCHR
+# define S_IFCHR	0
+#endif
+#ifndef S_IFBLK
+# define S_IFBLK	0
+#endif
+#ifndef S_IFLNK
+# define S_IFLNK	0
+#endif
+#ifndef S_IFREG
+# define S_IFREG	0
+#endif
+#ifndef S_IFDIR
+# define S_IFDIR	0
+#endif
+#ifndef S_IFWHT
+# define S_IFWHT	0
+#endif
+#ifndef S_IFSOCK
+# define S_IFSOCK	0
+#endif
+
 #ifndef MAP_ANONYMOUS
 # ifdef MAP_ANON
 #  define MAP_ANONYMOUS MAP_ANON
@@ -232,6 +304,16 @@
 # define MAP_NONBLOCK   0
 #endif
 
+#ifndef makedev
+# define makedev(maj,min) (((maj) << 8) | (min))
+#endif
+#ifndef major
+# define major(dev) ((dev) >> 8)
+#endif
+#ifndef minor
+# define minor(dev) ((dev) & 0xff)
+#endif
+
 #ifndef PAGESIZE
 # define PAGESIZE sysconf (_SC_PAGESIZE)
 #endif
@@ -354,6 +436,7 @@
         {
           sv_result = sv_result_cache; sv_result_cache = 0;
           SvIV_set (sv_result, req->result);
+          SvIOK_only (sv_result);
         }
       else
         {
@@ -527,7 +610,7 @@
             }
             break;
 
-          case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
+          case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
             if (req->result > 0)
               SvIV_set (sv_result, 0);
             /* FALLTHROUGH */
@@ -637,6 +720,9 @@
 #if !_POSIX_MAPPED_FILES
 # define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
 # define munmap(addr,length)                  (errno = ENOSYS, -1)
+#endif
+
+#if !_POSIX_MEMORY_PROTECTION
 # define mprotect(addr,len,prot)              (errno = ENOSYS, -1)
 # define PROT_NONE   0
 # define PROT_WRITE  0
@@ -726,9 +812,33 @@
     const_iv (O_TRUNC)
     const_iv (O_EXCL)
     const_iv (O_APPEND)
-#ifndef _WIN32
+
+    const_iv (O_ASYNC)
+    const_iv (O_DIRECT)
+    const_iv (O_NOATIME)
+
+    const_iv (O_CLOEXEC)
+    const_iv (O_NOCTTY)
+    const_iv (O_NOFOLLOW)
+    const_iv (O_NONBLOCK)
+    const_iv (O_EXEC)
+    const_iv (O_SEARCH)
+    const_iv (O_DIRECTORY)
+    const_iv (O_DSYNC)
+    const_iv (O_RSYNC)
+    const_iv (O_SYNC)
+    const_iv (O_TTY_INIT)
+
     const_iv (S_IFIFO)
-#endif
+    const_iv (S_IFCHR)
+    const_iv (S_IFBLK)
+    const_iv (S_IFLNK)
+    const_iv (S_IFREG)
+    const_iv (S_IFDIR)
+    const_iv (S_IFWHT)
+    const_iv (S_IFSOCK)
+    const_iv (S_IFMT)
+
     const_niv (FADV_NORMAL    , POSIX_FADV_NORMAL)
     const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
     const_niv (FADV_RANDOM    , POSIX_FADV_RANDOM)
@@ -820,7 +930,7 @@
 }
 
 void
-max_poll_reqs (int nreqs)
+max_poll_reqs (unsigned int nreqs)
 	PROTOTYPE: $
         CODE:
         eio_set_max_poll_reqs (nreqs);
@@ -832,25 +942,31 @@
         eio_set_max_poll_time (nseconds);
 
 void
-min_parallel (int nthreads)
+min_parallel (unsigned int nthreads)
 	PROTOTYPE: $
         CODE:
         eio_set_min_parallel (nthreads);
 
 void
-max_parallel (int nthreads)
+max_parallel (unsigned int nthreads)
 	PROTOTYPE: $
         CODE:
         eio_set_max_parallel (nthreads);
 
 void
-max_idle (int nthreads)
+max_idle (unsigned int nthreads)
 	PROTOTYPE: $
         CODE:
         eio_set_max_idle (nthreads);
 
 void
-max_outstanding (int maxreqs)
+idle_timeout (unsigned int seconds)
+	PROTOTYPE: $
+        CODE:
+        eio_set_idle_timeout (seconds);
+
+void
+max_outstanding (unsigned int maxreqs)
 	PROTOTYPE: $
         CODE:
         max_outstanding = maxreqs;
@@ -1060,6 +1176,22 @@
         REQ_SEND;
 }
 
+UV
+major (UV dev)
+	ALIAS:
+        minor = 1
+	CODE:
+        RETVAL = ix ? major (dev) : minor (dev);
+	OUTPUT:
+        RETVAL
+
+UV
+makedev (UV maj, UV min)
+	CODE:
+        RETVAL = makedev (maj, min);
+	OUTPUT:
+        RETVAL
+
 void
 aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
 	PPCODE:
@@ -1524,7 +1656,7 @@
 
         addr = (void *)(((intptr_t)addr) + offset);
         eio_page_align (&addr, &len);
-#if _POSIX_MEMLOCK
+#if _POSIX_MEMLOCK_RANGE
         RETVAL = munlock (addr, len);
 #else
         RETVAL = ((errno = ENOSYS), -1);