diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2003-05-02 11:33:06 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-05-02 11:33:06 +0000 |
| commit | 6060edcbe24aaa467d5be6fe35bd52a6eecc72b3 (patch) | |
| tree | b2aeb7d7392849bc90e2ce9edf59756e4b8ede1d /gcc/diagnostic.c | |
| parent | ce61bf7ba759d99356b5fcdaa2bd6883395be016 (diff) | |
| download | gcc-6060edcbe24aaa467d5be6fe35bd52a6eecc72b3.zip gcc-6060edcbe24aaa467d5be6fe35bd52a6eecc72b3.tar.gz gcc-6060edcbe24aaa467d5be6fe35bd52a6eecc72b3.tar.bz2 | |
Makefile.in (TREE_H): Replace location.h with input.h.
* Makefile.in (TREE_H): Replace location.h with input.h.
(GTFILES) Remove location.h
(gt-lists.h): Replace gt-location.h with gt-input.h
* input.h (input_filename, input_line): Remove variables.
(location_s, location_t): Move from location.h.
(input_location): New.
(input_filename, input_line): New #defines.
* location.h: Remove.
* tree.h: Replace location.h with input.h.
(input_filename, input_line): Remove.
* diagnostic.h: Replace location.h with input.h.
* gcc.h (input_filename, input_filename_length): Remove declarations.
* toplev.c (input_filename, input_line): Remove.
(input_location): Define.
(push_srcloc, pop_srcloc): Adjust.
* diagnostic.c (diagnostic_report_current_module): Adjust.
f:
* lex.c (ffelex_file_pop_): Adjust file_stack member use.
(ffelex_file_push_): Likewise.
(ffelex_hash_): Likewise.
java:
* lex.h (input_lineno): Remove declaration.
* parse-scan.y: #include input.h.
(input_filename): Remove declaration.
(input_location): Add definition.
(input_line): Remove definition.
From-SVN: r66378
Diffstat (limited to 'gcc/diagnostic.c')
| -rw-r--r-- | gcc/diagnostic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 565e073..98c3bf0 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -1383,11 +1383,11 @@ diagnostic_report_current_module (context) if (p == input_file_stack->next) output_verbatim (&context->buffer, "In file included from %s:%d", - p->name, p->line); + p->location.file, p->location.line); else output_verbatim (&context->buffer, ",\n from %s:%d", - p->name, p->line); + p->location.file, p->location.line); output_verbatim (&context->buffer, ":\n"); diagnostic_set_last_module (context); } |