applied patch, with tweak suggested by Michael Parker

[p5sagit/p5-mst-13.2.git] / gv.c

diff --git a/gv.c b/gv.c
index e50bfbc..e8a2f9d 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -1046,7 +1046,7 @@ Gv_AMupdate(HV *stash)
             default:
               if (!SvROK(sv)) {
                 if (!SvOK(sv)) break;
-               gv = gv_fetchmethod(stash, SvPV(sv, na));
+               gv = gv_fetchmethod(stash, SvPV(sv, PL_na));
                 if (gv) cv = GvCV(gv);
                 break;
               }
@@ -1366,9 +1366,9 @@ amagic_call(SV *left, SV *right, int method, int flags)
     PUSHSTACKi(PERLSI_OVERLOAD);
     ENTER;
     SAVEOP();
-    op = (OP *) &myop;
+    PL_op = (OP *) &myop;
     if (PERLDB_SUB && PL_curstash != PL_debstash)
-       op->op_private |= OPpENTERSUB_DB;
+       PL_op->op_private |= OPpENTERSUB_DB;
     PUTBACK;
     pp_pushmark(ARGS);
 
@@ -1382,7 +1382,7 @@ amagic_call(SV *left, SV *right, int method, int flags)
     PUSHs((SV*)cv);
     PUTBACK;
 
-    if (op = pp_entersub(ARGS))
+    if (PL_op = pp_entersub(ARGS))
       CALLRUNOPS();
     LEAVE;
     SPAGAIN;