--- Convert-Scalar/Scalar.xs	2004/11/26 21:05:13	1.6
+++ Convert-Scalar/Scalar.xs	2008/03/07 10:33:46	1.9
@@ -2,10 +2,6 @@
 #include "perl.h"
 #include "XSUB.h"
 
-#if PERL_VERSION < 7
-# define is_utf8_string(s,l) (croak ("utf8_valid requires perl 5.7 or higher"), 0)
-#endif
-
 #define RETCOPY(sv)		\
   if (GIMME_V != G_VOID)	\
     { 				\
@@ -17,7 +13,7 @@
 
 MODULE = Convert::Scalar		PACKAGE = Convert::Scalar
 
-int
+bool
 utf8(scalar,mode=0)
 	SV *	scalar
         SV *	mode
@@ -92,7 +88,7 @@
         if (SvREADONLY (scalar))
           croak ("Convert::Scalar::utf8_downgrade called on read only scalar");
 
-        RETVAL = sv_utf8_downgrade (scalar, fail_ok);
+        RETVAL = !!sv_utf8_downgrade (scalar, fail_ok);
 	OUTPUT:
 	RETVAL
 
@@ -138,12 +134,12 @@
 	CODE:
         SvTAINTED_on (scalar);
 
-int
+bool
 tainted(scalar)
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvTAINTED (scalar);
+        RETVAL = !!SvTAINTED (scalar);
 	OUTPUT:
         RETVAL
 
@@ -216,7 +212,7 @@
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvOK (scalar);
+        RETVAL = !!SvOK (scalar);
 	OUTPUT:
         RETVAL
 
@@ -225,7 +221,7 @@
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvUOK (scalar);
+        RETVAL = !!SvUOK (scalar);
 	OUTPUT:
         RETVAL
 
@@ -234,7 +230,7 @@
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvROK (scalar);
+        RETVAL = !!SvROK (scalar);
 	OUTPUT:
         RETVAL
 
@@ -243,7 +239,7 @@
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvPOK (scalar);
+        RETVAL = !!SvPOK (scalar);
 	OUTPUT:
         RETVAL
 
@@ -252,7 +248,7 @@
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvNOK (scalar);
+        RETVAL = !!SvNOK (scalar);
 	OUTPUT:
         RETVAL
 
@@ -261,7 +257,7 @@
 	SV *	scalar
         PROTOTYPE: $
         CODE:
-        RETVAL = SvNIOK (scalar);
+        RETVAL = !!SvNIOK (scalar);
 	OUTPUT:
         RETVAL