diff options
author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-02-04 13:06:30 +0000 |
---|---|---|
committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-02-04 13:06:30 +0000 |
commit | 6e0abaeff04449c0f82bddab2082731b496a8e16 (patch) | |
tree | 62f3700cf979a16092b73b57d64067ad65eef6d1 /gcc | |
parent | a852e3b162de7b5da4e3f556e6c0ef2a6be585b8 (diff) | |
download | gcc-6e0abaeff04449c0f82bddab2082731b496a8e16.tar.gz |
1999-02-04 16:04 -0500 Zack Weinberg <zack@rabi.columbia.edu>
* cpperror.c (cpp_print_containing_files): Fix formatting
bug induced by merge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25025 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/cpperror.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3a222884d01..793d7aa7cb2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +1999-02-04 16:04 -0500 Zack Weinberg <zack@rabi.columbia.edu> + + * cpperror.c (cpp_print_containing_files): Fix formatting + bug induced by merge. + Thu Feb 4 10:46:30 1999 Gavin Romig-Koch <gavin@cygnus.com> * config/mips/mips.md ([u]divmodsi4,[u]divmoddi4,[u]divsi3,[u]divdi3, diff --git a/gcc/cpperror.c b/gcc/cpperror.c index 4a4cc07c184..af018815d93 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; |