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/cppmain.c | |
| parent | e2187d3b5278e31a321fae25879d9044248d2287 (diff) | |
| download | gcc-eb1f4d9d2804a8f244a06bff2d22d62906cccbb8.zip gcc-eb1f4d9d2804a8f244a06bff2d22d62906cccbb8.tar.gz gcc-eb1f4d9d2804a8f244a06bff2d22d62906cccbb8.tar.bz2 | |
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/cppmain.c')
| -rw-r--r-- | gcc/cppmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 706ff2f..ed6858e 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -57,7 +57,7 @@ static void cb_undef PARAMS ((cpp_reader *, cpp_hashnode *)); static void cb_include PARAMS ((cpp_reader *, const unsigned char *, const cpp_token *)); static void cb_ident PARAMS ((cpp_reader *, const cpp_string *)); -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 cb_def_pragma PARAMS ((cpp_reader *)); static void do_pragma_implementation PARAMS ((cpp_reader *)); @@ -154,7 +154,7 @@ setup_callbacks () pfile->cb.ident = cb_ident; pfile->cb.def_pragma = cb_def_pragma; if (! CPP_OPTION (pfile, no_line_commands)) - pfile->cb.change_file = cb_change_file; + pfile->cb.file_change = cb_file_change; } if (CPP_OPTION (pfile, dump_includes)) @@ -374,7 +374,7 @@ cb_include (pfile, dir, header) } static void -cb_change_file (pfile, fc) +cb_file_change (pfile, fc) cpp_reader *pfile ATTRIBUTE_UNUSED; const cpp_file_change *fc; { |