X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.c;h=2b96829572d8dad3c36860131f51283f129a9fbf;hb=778ddebdd36200650e05e3789258e36307a5988b;hp=4f0616f6c998b49939007fe724072bf5e1356b5c;hpb=f1192ceea6b2a126a4ff3254f91c2bc47c361c71;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.c b/mg.c
index 4f0616f..2b96829 100644
--- a/mg.c
+++ b/mg.c
@@ -478,8 +478,7 @@ magic_get(SV *sv, MAGIC *mg)
 		    }
 		    sv_setpvn(sv,s,i);
 		    if (tainting)
-			tainted = (was_tainted || RX_MATCH_TAINTED(rx) ||
-				   (curpm->op_pmflags & PMf_TAINTMEM));
+			tainted = (was_tainted || RX_MATCH_TAINTED(rx));
 		    break;
 		}
 	    }
@@ -982,7 +981,7 @@ magic_methpack(SV *sv, MAGIC *mg, char *meth)
 
     ENTER;
     SAVETMPS;
-    PUSHSTACKi(SI_MAGIC);
+    PUSHSTACKi(PERLSI_MAGIC);
 
     if (magic_methcall(mg, meth, G_SCALAR, 2, NULL)) {
 	sv_setsv(sv, *stack_sp--);
@@ -1008,7 +1007,7 @@ magic_setpack(SV *sv, MAGIC *mg)
 {
     dSP;
     ENTER;
-    PUSHSTACKi(SI_MAGIC);
+    PUSHSTACKi(PERLSI_MAGIC);
     magic_methcall(mg, "STORE", G_SCALAR|G_DISCARD, 3, sv);
     POPSTACK;
     LEAVE;
@@ -1030,7 +1029,7 @@ magic_sizepack(SV *sv, MAGIC *mg)
 
     ENTER;
     SAVETMPS;
-    PUSHSTACKi(SI_MAGIC);
+    PUSHSTACKi(PERLSI_MAGIC);
     if (magic_methcall(mg, "FETCHSIZE", G_SCALAR, 2, NULL)) {
 	sv = *stack_sp--;
 	retval = (U32) SvIV(sv)-1;
@@ -1046,7 +1045,7 @@ int magic_wipepack(SV *sv, MAGIC *mg)
     dSP;
 
     ENTER;
-    PUSHSTACKi(SI_MAGIC);
+    PUSHSTACKi(PERLSI_MAGIC);
     PUSHMARK(SP);
     XPUSHs(mg->mg_obj);
     PUTBACK;
@@ -1064,7 +1063,7 @@ magic_nextpack(SV *sv, MAGIC *mg, SV *key)
 
     ENTER;
     SAVETMPS;
-    PUSHSTACKi(SI_MAGIC);
+    PUSHSTACKi(PERLSI_MAGIC);
     PUSHMARK(SP);
     EXTEND(SP, 2);
     PUSHs(mg->mg_obj);
@@ -1948,7 +1947,7 @@ sighandler(int sig)
 	sv_setpv(sv,sig_name[sig]);
     }
 
-    PUSHSTACKi(SI_SIGNAL);
+    PUSHSTACKi(PERLSI_SIGNAL);
     PUSHMARK(SP);
     PUSHs(sv);
     PUTBACK;