From 74c9467af51e9d9b606c1592fd4cfdecbd1ddcb3 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 4 Feb 1999 13:06:30 +0000 Subject: [PATCH] cpperror.c (cpp_print_containing_files): Fix formatting bug induced by merge. 1999-02-04 16:04 -0500 Zack Weinberg * cpperror.c (cpp_print_containing_files): Fix formatting bug induced by merge. From-SVN: r25025 --- gcc/ChangeLog | 5 +++++ gcc/cpperror.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3a222884d01b..793d7aa7cb2b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +1999-02-04 16:04 -0500 Zack Weinberg + + * cpperror.c (cpp_print_containing_files): Fix formatting + bug induced by merge. + Thu Feb 4 10:46:30 1999 Gavin Romig-Koch * config/mips/mips.md ([u]divmodsi4,[u]divmoddi4,[u]divsi3,[u]divdi3, diff --git a/gcc/cpperror.c b/gcc/cpperror.c index 4a4cc07c1842..af018815d933 100644 --- a/gcc/cpperror.c +++ b/gcc/cpperror.c @@ -63,16 +63,16 @@ cpp_print_containing_files (pfile) if (first) { first = 0; - cpp_notice ("In file included from "); + cpp_notice ("In file included from %s:%ld", + ip->nominal_fname, line); } else - cpp_notice (",\n from "); + cpp_message (pfile, -1, ",\n from %s:%ld", + ip->nominal_fname, line); } - - fprintf (stderr, " from %s:%ld", ip->nominal_fname, line); } if (! first) - fprintf (stderr, ":\n"); + fputs (":\n", stderr); /* Record we have printed the status as of this time. */ pfile->input_stack_listing_current = 1;