aboutsummaryrefslogtreecommitdiff
path: root/gcc/scan-decls.c
diff options
context:
space:
mode:
authorNeil Booth <neilb@earthling.net>2000-11-27 08:00:04 +0000
committerNeil Booth <neil@gcc.gnu.org>2000-11-27 08:00:04 +0000
commit27e2564ac886bee1a7552df98dcab17a4bf06e26 (patch)
tree6ecb94c4e9edb0c2004142e389531669ea20c416 /gcc/scan-decls.c
parent9ccb25d582aba15db6bb27944085c7478d532ade (diff)
downloadgcc-27e2564ac886bee1a7552df98dcab17a4bf06e26.zip
gcc-27e2564ac886bee1a7552df98dcab17a4bf06e26.tar.gz
gcc-27e2564ac886bee1a7552df98dcab17a4bf06e26.tar.bz2
c-lex.c (cb_enter_file, [...]): Combine into the new function cb_change_file.
* c-lex.c (cb_enter_file, cb_leave_file, cb_rename_file): Combine into the new function cb_change_file. (init_c_lex): Update. * cppfiles.c (stack_include_file): Use _cpp_do_file_change. (cpp_syshdr_flags): Delete. * cpphash.h (_cpp_do_file_change): New prototype. Move struct cpp_buffer here from... * cpplib.h (struct cpp_buffer): ... here. (enum cpp_fc_reason, struct cpp_file_loc, struct_cpp_file_change, change_file): New. (enter_file, leave_file, rename_file, cpp_syshdr_flags): Delete. * cpplib.c (do_line): Update for new cb_change_file callback. (_cpp_do_file_change): New function. (_cpp_pop_buffer): Update to use it. * cppmain.c (move_printer): Delete. (main): Set up single callback cb_change_file. (cb_enter_file, cb_leave_file, cb_rename_file): Delete. (cb_change_file): New. * fix-header.c (cur_file, cb_change_file): New. (recognized_function, read_scan_file): Update. * scan-decls.c (scan_decls): Update. * scan.h (recognized_function): Update prototype. From-SVN: r37784
Diffstat (limited to 'gcc/scan-decls.c')
-rw-r--r--gcc/scan-decls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c
index ba0a00c..cd92cdd 100644
--- a/gcc/scan-decls.c
+++ b/gcc/scan-decls.c
@@ -181,8 +181,7 @@ scan_decls (pfile, argc, argv)
cpp_get_line (pfile)->line,
(saw_inline ? 'I'
: in_extern_C_brace || current_extern_C
- ? 'F' : 'f'), have_arg_list,
- CPP_BUFFER (pfile)->nominal_fname);
+ ? 'F' : 'f'), have_arg_list);
cpp_get_token (pfile, &token);
if (token.type == CPP_OPEN_BRACE)
{