--- IO-AIO/typemap	2006/10/31 00:32:19	1.5
+++ IO-AIO/typemap	2009/11/12 00:01:52	1.9
@@ -2,11 +2,18 @@
 aio_req_ornot	T_AIO_ORNOT
 SV8 *		T_SV8
 
+size_t          T_VAL64
+ssize_t         T_VAL64
+off_t           T_VAL64
+
+aio_rfd		T_AIO_RFD
+aio_wfd		T_AIO_WFD
+
 INPUT
 
 T_AIO
 	if (!($var = SvAIO_REQ ($arg)))
-          croak (\"busy \" AIO_REQ_KLASS \" object expected\")
+          croak (\"busy IO::AIO::REQ object expected\")
 
 T_AIO_ORNOT
 	if (!($var = SvAIO_REQ ($arg)))
@@ -14,5 +21,19 @@
 
 T_SV8
 	($var) = $arg;
-        if (SvPOK ($var) && !sv_utf8_downgrade ($var, 1))
+        if (SvPOKp ($var) && !sv_utf8_downgrade ($var, 1))
           croak (\"\\\"%s\\\" argument must be byte/octet-encoded\", \"$var\")
+
+T_VAL64
+	$var = ($type)SvVAL64 ($arg);
+
+T_AIO_RFD
+  	$var = s_fileno_croak ($arg, 0);
+
+T_AIO_WFD
+  	$var = s_fileno_croak ($arg, 1);
+
+OUTPUT
+
+T_VAL64
+	$arg = newSVval64 ($var);