integrate cfgperl contents into mainline

p4raw-id: //depot/perl@4303

1 files changed, 2 insertions, 15 deletions

diff --git a/util.c b/util.c
index 24af6622f8..d9f289b889 100644
--- a/util.c
+++ b/util.c
@@ -1418,29 +1418,16 @@ Perl_vmess(pTHX_ const char *pat, va_list *args)
     sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));
     if (!SvCUR(sv) || *(SvEND(sv) - 1) != '\n') {
 	dTHR;
-#ifdef IV_IS_QUAD
 	if (PL_curcop->cop_line)
-	    Perl_sv_catpvf(aTHX_ sv, " at %_ line %" PERL_PRId64,
+	    Perl_sv_catpvf(aTHX_ sv, " at %_ line %"IVdf,
 		      GvSV(PL_curcop->cop_filegv), (IV)PL_curcop->cop_line);
-#else
-	if (PL_curcop->cop_line)
-	    Perl_sv_catpvf(aTHX_ sv, " at %_ line %ld",
-		      GvSV(PL_curcop->cop_filegv), (long)PL_curcop->cop_line);
-#endif
 	if (GvIO(PL_last_in_gv) && IoLINES(GvIOp(PL_last_in_gv))) {
 	    bool line_mode = (RsSIMPLE(PL_rs) &&
 			      SvCUR(PL_rs) == 1 && *SvPVX(PL_rs) == '\n');
-#ifdef IV_IS_QUAD
-	    Perl_sv_catpvf(aTHX_ sv, ", <%s> %s %" PERL_PRId64,
+	    Perl_sv_catpvf(aTHX_ sv, ", <%s> %s %"IVdf,
 		      PL_last_in_gv == PL_argvgv ? "" : GvNAME(PL_last_in_gv),
 		      line_mode ? "line" : "chunk", 
 		      (IV)IoLINES(GvIOp(PL_last_in_gv)));
-#else
-	    Perl_sv_catpvf(aTHX_ sv, ", <%s> %s %ld",
-		      PL_last_in_gv == PL_argvgv ? "" : GvNAME(PL_last_in_gv),
-		      line_mode ? "line" : "chunk", 
-		      (long)IoLINES(GvIOp(PL_last_in_gv)));
-#endif
 	}
 #ifdef USE_THREADS
 	if (thr->tid)