add newer malloc.c from Ilya Zakharevich <ilya@math.ohio-state.edu>

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / typemap

diff --git a/lib/ExtUtils/typemap b/lib/ExtUtils/typemap
index 430c28a..03ba050 100644 (file)
--- a/lib/ExtUtils/typemap
+++ b/lib/ExtUtils/typemap
@@ -190,44 +190,44 @@ T_HVREF
 T_CVREF
        $arg = newRV((SV*)$var);
 T_IV
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_INT
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_SYSRET
        if ($var != -1) {
            if ($var == 0)
-               SvSetMagicPVN($arg, "0 but true", 10);
+               sv_setpvn($arg, "0 but true", 10);
            else
-               SvSetMagicIV($arg, (IV)$var);
+               sv_setiv($arg, (IV)$var);
        }
 T_ENUM
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_BOOL
        $arg = boolSV($var);
 T_U_INT
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_SHORT
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_U_SHORT
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_LONG
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_U_LONG
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_CHAR
-       SvSetMagicPVN($arg, (char *)&$var, 1);
+       sv_setpvn($arg, (char *)&$var, 1);
 T_U_CHAR
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_FLOAT
-       SvSetMagicNV($arg, (double)$var);
+       sv_setnv($arg, (double)$var);
 T_NV
-       SvSetMagicNV($arg, (double)$var);
+       sv_setnv($arg, (double)$var);
 T_DOUBLE
-       SvSetMagicNV($arg, (double)$var);
+       sv_setnv($arg, (double)$var);
 T_PV
-       SvSetMagicPV((SV*)$arg, $var);
+       sv_setpv((SV*)$arg, $var);
 T_PTR
-       SvSetMagicIV($arg, (IV)$var);
+       sv_setiv($arg, (IV)$var);
 T_PTRREF
        sv_setref_pv($arg, Nullch, (void*)$var);
 T_REF_IV_REF
@@ -244,17 +244,17 @@ T_REFREF
 T_REFOBJ
        NOT IMPLEMENTED
 T_OPAQUE
-       SvSetMagicPVN($arg, (char *)&$var, sizeof($var));
+       sv_setpvn($arg, (char *)&$var, sizeof($var));
 T_OPAQUEPTR
-       SvSetMagicPVN($arg, (char *)$var, sizeof(*$var)), XFree((char *)$var);
+       sv_setpvn($arg, (char *)$var, sizeof(*$var)), XFree((char *)$var);
 T_PACKED
        XS_pack_$ntype($arg, $var);
 T_PACKEDARRAY
        XS_pack_$ntype($arg, $var, count_$ntype);
 T_DATAUNIT     
-       SvSetMagicPVN($arg, $var.chp(), $var.size());
+       sv_setpvn($arg, $var.chp(), $var.size());
 T_CALLBACK
-       SvSetMagicPVN($arg, $var.context.value().chp(),
+       sv_setpvn($arg, $var.context.value().chp(),
                $var.context.value().size());
 T_ARRAY
        ST_EXTEND($var.size);
@@ -262,12 +262,12 @@ T_ARRAY
                ST(ix_$var) = sv_newmortal();
        DO_ARRAY_ELEM
        }
-       sp += $var.size - 1;
+       SP += $var.size - 1;
 T_IN
        {
            GV *gv = newGVgen("$Package");
            if ( do_open(gv, "<&", 2, FALSE, 0, 0, $var) )
-               SvSetMagicSV($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+               sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
            else
                $arg = &sv_undef;
        }
@@ -275,7 +275,7 @@ T_INOUT
        {
            GV *gv = newGVgen("$Package");
            if ( do_open(gv, "+<&", 3, FALSE, 0, 0, $var) )
-               SvSetMagicSV($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+               sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
            else
                $arg = &sv_undef;
        }
@@ -283,7 +283,7 @@ T_OUT
        {
            GV *gv = newGVgen("$Package");
            if ( do_open(gv, "+>&", 3, FALSE, 0, 0, $var) )
-               SvSetMagicSV($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+               sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
            else
                $arg = &sv_undef;
        }