wrong setting in canned win32/config.vc64 file

[p5sagit/p5-mst-13.2.git] / pp.h

diff --git a/pp.h b/pp.h
index d5e3bf9..21d3c9d 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -87,7 +87,6 @@ Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
 
 #define NORMAL PL_op->op_next
 #define DIE return Perl_die
-#define DIE_NULL return DieNull
 
 /*
 =for apidoc Ams||PUTBACK
@@ -398,23 +397,29 @@ and C<PUSHu>.
 #define AMGf_assign    4
 #define AMGf_unary     8
 
-#define tryAMAGICbinW(meth,assign,set) STMT_START { \
+#define tryAMAGICbinW_var(meth_enum,assign,set) STMT_START { \
           if (PL_amagic_generation) { \
            SV* tmpsv; \
            SV* const right= *(sp); SV* const left= *(sp-1);\
            if ((SvAMAGIC(left)||SvAMAGIC(right))&&\
                (tmpsv=amagic_call(left, \
                                   right, \
-                                  CAT2(meth,_amg), \
+                                  meth_enum, \
                                   (assign)? AMGf_assign: 0))) {\
               SPAGAIN; \
               (void)POPs; set(tmpsv); RETURN; } \
          } \
        } STMT_END
 
+#define tryAMAGICbinW(meth,assign,set) \
+    tryAMAGICbinW_var(CAT2(meth,_amg),assign,set)
+
 #define tryAMAGICbin(meth,assign) tryAMAGICbinW(meth,assign,SETsv)
 #define tryAMAGICbinSET(meth,assign) tryAMAGICbinW(meth,assign,SETs)
 
+#define tryAMAGICbinSET_var(meth_enum,assign) \
+    tryAMAGICbinW_var(meth_enum,assign,SETs)
+
 #define AMG_CALLun(sv,meth) amagic_call(sv,&PL_sv_undef,  \
                                        CAT2(meth,_amg),AMGf_noright | AMGf_unary)
 #define AMG_CALLbinL(left,right,meth) \