diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2000-12-18 19:00:26 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-12-18 19:00:26 +0000 |
| commit | eb1f4d9d2804a8f244a06bff2d22d62906cccbb8 (patch) | |
| tree | dc29c41d4ea8d368485a05613f91c17d4bec16ea /gcc/fix-header.c | |
| parent | e2187d3b5278e31a321fae25879d9044248d2287 (diff) | |
| download | gcc-eb1f4d9d2804a8f244a06bff2d22d62906cccbb8.tar.gz | |
c-lex.c: s/change_file/file_change.
* c-lex.c: s/change_file/file_change.
* cpplib.h: Similarly.
* cppmain.c: Similarly.
* fix-header.c: Similarly.
* cppfiles.c (stack_include_file): Pass the buffer location and
size to cpp_push_buffer. Generate the file_change callback,
so that sysp is already set.
* cpphash.h: Add _cpp_do_file_change.
* cpplib.c (do_line): Set buffer->sysp directly. Generate the
file_change callback after setting sysp.
(_cpp_do_file_change): Handle FC_ENTER and the FC_RENAME exception
here.
(cpp_push_buffer): Don't generate a callback. Clear sysp.
(cpp_pop_buffer): Clean up logic.
From-SVN: r38357
Diffstat (limited to 'gcc/fix-header.c')
| -rw-r--r-- | gcc/fix-header.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fix-header.c b/gcc/fix-header.c index 6549b37e7f0..28cfe870974 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -199,7 +199,7 @@ static int inf_skip_spaces PARAMS ((int)); static int inf_read_upto PARAMS ((sstring *, int)); static int inf_scan_ident PARAMS ((sstring *, int)); static int check_protection PARAMS ((int *, int *)); -static void cb_change_file PARAMS ((cpp_reader *, const cpp_file_change *)); +static void cb_file_change PARAMS ((cpp_reader *, const cpp_file_change *)); static void add_symbols (flags, names) @@ -598,7 +598,7 @@ check_macro_names (pfile, names) } static void -cb_change_file (pfile, fc) +cb_file_change (pfile, fc) cpp_reader *pfile ATTRIBUTE_UNUSED; const cpp_file_change *fc; { @@ -620,7 +620,7 @@ read_scan_file (in_fname, argc, argv) obstack_init (&scan_file_obstack); scan_in = cpp_create_reader (CLK_GNUC89); - scan_in->cb.change_file = cb_change_file; + scan_in->cb.file_change = cb_file_change; /* We are going to be scanning a header file out of its proper context, so ignore warnings and errors. */ |