Integrate win32 branch back into mainline.
Malcolm Beattie [Thu, 27 Nov 1997 16:12:15 +0000 (16:12 +0000)]
p4raw-id: //depot/perl@322

1  2 
op.c

diff --cc op.c
--- 1/op.c
--- 2/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))) {