From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Thu, 27 Nov 1997 16:12:15 +0000 (+0000)
Subject: Integrate win32 branch back into mainline.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f0bea234ec0a451a052c1e57903238c612bb1c20;p=p5sagit%2Fp5-mst-13.2.git

Integrate win32 branch back into mainline.

p4raw-id: //depot/perl@322
---

f0bea234ec0a451a052c1e57903238c612bb1c20
diff --cc op.c
index 6c29226,35fd3a0..a922a2b
--- a/op.c
+++ b/op.c
@@@ -3438,14 -3437,11 +3437,11 @@@ newSUB(I32 floor, OP *o, OP *proto, OP 
  	    CV *cv;
  	    HV *hv;
  
 -	    sv_setpvf(sv, "%_:%ld-%ld",
 -		    GvSV(curcop->cop_filegv),
 -		    (long)subline, (long)curcop->cop_line);
 +	    sv_setpvf(sv, "%_:%ld-%ld", GvSV(curcop->cop_filegv),
 +		    (long)(subline < 0 ? -subline : subline),
 +		    (long)curcop->cop_line);
  	    gv_efullname3(tmpstr, gv, Nullch);
  	    hv_store(GvHV(DBsub), SvPVX(tmpstr), SvCUR(tmpstr), sv, 0);
- 	    if (!db_postponed) {
- 		db_postponed = gv_fetchpv("DB::postponed", GV_ADDMULTI, SVt_PVHV);
- 	    }
  	    hv = GvHVn(db_postponed);
  	    if (HvFILL(hv) > 0 && hv_exists(hv, SvPVX(tmpstr), SvCUR(tmpstr))
  		  && (cv = GvCV(db_postponed))) {