Integrate with Sarathy.

p4raw-id: //depot/cfgperl@4549

1 files changed, 3 insertions, 3 deletions

diff --git a/pp.c b/pp.c
index 7d1673cb70..1fb26c3a6c 100644
--- a/pp.c
+++ b/pp.c
@@ -254,7 +254,7 @@ PP(pp_rv2gv)
 			    }
 			}
 		    }
-		    gv_init(gv, PL_curcop->cop_stash, name, len, 0);
+		    gv_init(gv, CopSTASH(PL_curcop), name, len, 0);
 		    sv_upgrade(sv, SVt_RV);
 		    SvRV(sv) = (SV *) gv;
 		    SvROK_on(sv);
@@ -581,7 +581,7 @@ PP(pp_bless)
     HV *stash;
 
     if (MAXARG == 1)
-	stash = PL_curcop->cop_stash;
+	stash = CopSTASH(PL_curcop);
     else {
 	SV *ssv = POPs;
 	STRLEN len;
@@ -854,7 +854,7 @@ PP(pp_undef)
 	    Newz(602, gp, 1, GP);
 	    GvGP(sv) = gp_ref(gp);
 	    GvSV(sv) = NEWSV(72,0);
-	    GvLINE(sv) = PL_curcop->cop_line;
+	    GvLINE(sv) = CopLINE(PL_curcop);
 	    GvEGV(sv) = (GV*)sv;
 	    GvMULTI_on(sv);
 	}