From 769c30bc4bb5d7abeb7306e297a4071100a0e741 Mon Sep 17 00:00:00 2001 From: Gurusamy Sarathy Date: Tue, 25 Nov 1997 20:57:31 +0000 Subject: [PATCH] [win32] Fixup the places where the automatic merge got it wrong. Previous change (#302) was just a normal integration--ignore the "reverse" in there. p4raw-id: //depot/win32/perl@303 --- op.c | 6 +++--- perl.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/op.c b/op.c index c86880c..070fce4 100644 --- a/op.c +++ b/op.c @@ -3437,9 +3437,9 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) CV *cv; HV *hv; - sv_setpvf(sv, "%_:%ld-%ld", GvSV(curcop->cop_filegv), - (long)(subline < 0 ? -subline : subline), - (long)curcop->cop_line); + sv_setpvf(sv, "%_:%ld-%ld", + GvSV(curcop->cop_filegv), + (long)subline, (long)curcop->cop_line); gv_efullname3(tmpstr, gv, Nullch); hv_store(GvHV(DBsub), SvPVX(tmpstr), SvCUR(tmpstr), sv, 0); if (!db_postponed) { diff --git a/perl.h b/perl.h index c05d4a9..0ffb04c 100644 --- a/perl.h +++ b/perl.h @@ -2309,10 +2309,6 @@ EXT bool numeric_local INIT(TRUE); /* Assume local numerics */ #define PERL_SCRIPT_MODE "r" #endif -#ifndef PERL_SCRIPT_MODE -#define PERL_SCRIPT_MODE "r" -#endif - /* * nice_chunk and nice_chunk size need to be set * and queried under the protection of sv_mutex -- 2.7.4