--- IO-AIO/AIO.xs	2014/04/11 05:19:40	1.229
+++ IO-AIO/AIO.xs	2015/02/11 19:32:36	1.231
@@ -310,7 +310,7 @@
 static SV *
 newSVaio_wd (aio_wd wd)
 {
-  return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
+  return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
 }
 
 static aio_req
@@ -1266,9 +1266,8 @@
         else
           {
             /* read: check type and grow scalar as necessary */
-            SvUPGRADE (data, SVt_PV);
-            if (SvLEN (data) >= SvCUR (data))
-              svptr = SvGROW (data, len + dataoffset + 1);
+            if (!SvPOK (data) || SvLEN (data) >= SvCUR (data))
+              svptr = sv_grow (data, len + dataoffset + 1);
             else if (SvCUR (data) < len + dataoffset)
               croak ("length + dataoffset outside of scalar, and cannot grow");
           }
@@ -1744,7 +1743,7 @@
         RETVAL
 
 void
-mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
+mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
 	PPCODE:
         sv_unmagic (scalar, MMAP_MAGIC);
 {
@@ -1781,14 +1780,14 @@
         sv_unmagic (scalar, MMAP_MAGIC);
 
 int
-madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
+madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
 	ALIAS:
         mprotect = 1
         CODE:
 {
 	STRLEN svlen;
 	void *addr = SvPVbyte (scalar, svlen);
-        size_t len = SvUV (length);
+        STRLEN len = SvUV (length);
 
         if (offset < 0)
           offset += svlen;
@@ -1812,7 +1811,7 @@
         RETVAL
 
 int
-munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
+munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef)
         CODE:
 {
 	STRLEN svlen;