--- IO-AIO/AIO.xs	2009/06/06 17:25:13	1.141
+++ IO-AIO/AIO.xs	2009/06/12 16:55:17	1.145
@@ -256,8 +256,8 @@
                                 }
 
                               av_store (avent, 0, namesv);
-                              av_store (avent, 1, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
-                              av_store (avent, 2, SvREFCNT_inc (sv_type [ent->type]));
+                              av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
+                              av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
 
                               av_store (av, i, newRV_noinc ((SV *)avent));
                             }
@@ -296,15 +296,15 @@
                   char sym [64];
                   int symlen;
                   
-                  symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);
+                  symlen = snprintf (sym, sizeof (sym), "fd#%u", (unsigned int)req->result);
                   gv_init (gv, stash, sym, symlen, 0);
 
                   symlen = snprintf (
                      sym,
                      sizeof (sym),
-                     "%s&=%d",
+                     "%s&=%u",
                      flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
-                     req->result
+                     (unsigned int)req->result
                   );
 
                   if (do_open (gv, sym, symlen, 0, 0, 0, 0))
@@ -557,7 +557,7 @@
 
 BOOT:
 {
-  stash = gv_stashpv ("IO::AIO", 1);
+  HV *stash = gv_stashpv ("IO::AIO", 1);
 
   static const struct {
     const char *name;
@@ -963,7 +963,7 @@
         req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
 
         if (flags & EIO_READDIR_DENTS)
-          flags |= EIO_READDIR_CUSTOM2;
+          req->int1 |= EIO_READDIR_CUSTOM2;
 
 	REQ_SEND;
 }