diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/diagnostic.c | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 444b55f..21263c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-07-22 Per Bothner <pbothner@apple.com> + + * diagnostic.c.(diagnostic_report_current_module): Update to match + 2003-06-05 changes to push_srcloc and pop_srcloc. + 2003-07-22 Wolfgang Bangerth <bangerth@dealii.org> * doc/trouble.texi: Better document two-stage name lookup. diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 3475611..be4b03c 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -978,18 +978,16 @@ diagnostic_report_current_module (diagnostic_context *context) output_needs_newline (&context->buffer) = false; } - if (input_file_stack && input_file_stack->next != 0 - && diagnostic_last_module_changed (context)) + if (input_file_stack && diagnostic_last_module_changed (context)) { - for (p = input_file_stack->next; p; p = p->next) - if (p == input_file_stack->next) - output_verbatim (&context->buffer, - "In file included from %s:%d", - p->location.file, p->location.line); - else - output_verbatim (&context->buffer, - ",\n from %s:%d", - p->location.file, p->location.line); + p = input_file_stack; + output_verbatim (&context->buffer, + "In file included from %s:%d", + p->location.file, p->location.line); + while ((p = p->next) != NULL) + output_verbatim (&context->buffer, + ",\n from %s:%d", + p->location.file, p->location.line); output_verbatim (&context->buffer, ":\n"); diagnostic_set_last_module (context); } |