From 5621a3645f8d24e20cb362058f3dc24c5bccff94 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 14 Sep 2001 22:04:46 +0000 Subject: * cpperror.c (print_location): Take line and column, for default positioning use the previously lexed token. (_cpp_begin_message): Take line and column. (cpp_ice, cpp_fatal, cpp_error, cpp_error_with_line, cpp_warning, cpp_warning_with_line, cpp_pedwarn, cpp_pedwarn_with_line): Update. * cpphash.h (_cpp_begin_message): Update prototype. * cppinit.c (push_include): Don't set output line. * cpplex.c (_cpp_lex_token): Callback for start of new output lines. * cpplib.c (do_diagnostic, _cpp_pop_buffer): Update. (do_pragma): Kludge for front ends. Don't expand macros at all. * cpplib.h (cpp_lookahead, cpp_token_with_pos, cpp_get_line): Remove. (struct cpp_token): Remove output_line. (struct cpp_callbacks): New member line_change. * cppmacro.c (builtin_macro, paste_all_tokens, replace_args, cpp_get_token): Preserve BOL flag. (cpp_get_line): Remove. (_cpp_backup_tokens): Remove useless abort(). * cppmain.c (cb_line_change): New. (scan_translation_unit): Don't worry about starting new lines here. * scan-decls.c (scan_decls): Update. * c-lex.c (c_lex, init_c_lex): Update. (cb_line_change, src_lineno): New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45613 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/scan-decls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gcc/scan-decls.c') diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c index 2fe570e3ec4..7fd36cabe9e 100644 --- a/gcc/scan-decls.c +++ b/gcc/scan-decls.c @@ -170,8 +170,7 @@ scan_decls (pfile, argc, argv) || token.type == CPP_ELLIPSIS) have_arg_list = 1; } - recognized_function (&prev_id, - cpp_get_line (pfile)->line, + recognized_function (&prev_id, token->line, (saw_inline ? 'I' : in_extern_C_brace || current_extern_C ? 'F' : 'f'), have_arg_list); -- cgit v1.2.1