diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2003-07-29 22:26:13 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2003-07-29 22:26:13 +0000 |
| commit | 8f9b40094d6e960d965e632f6537bf6eaa980ab5 (patch) | |
| tree | 1789dbf490b4c620a39de9335b1d8002ee48603b /gcc/c-opts.c | |
| parent | ad96995ba1e08da3646502930168ea0c39a89ad7 (diff) | |
| download | gcc-8f9b40094d6e960d965e632f6537bf6eaa980ab5.zip gcc-8f9b40094d6e960d965e632f6537bf6eaa980ab5.tar.gz gcc-8f9b40094d6e960d965e632f6537bf6eaa980ab5.tar.bz2 | |
Makefile.in (LIBCPP_DEPS): Add HASHTAB_H.
* Makefile.in (LIBCPP_DEPS): Add HASHTAB_H.
* cppfiles.c: Completely rewritten.
* c-incpath.c (free_path, remove_duplicates, heads, tails, add_path):
struct cpp_path is now struct cpp_dir.
(remove_duplicates): Don't simplify path names.
* c-opts.c (c_common_parse_file): cpp_read_next_file renamed
cpp_stack_file.
* cpphash.h: Include hashtab.h.
(_cpp_file): Declare.
(struct cpp_buffer): struct include_file is now struct _cpp_file,
and struct cpp_path is now struct cpp_dir. Rename members.
(struct cpp_reader): Similarly. New members once_only_files,
file_hash, file_hash_entries, quote_ignores_source_dir,
no_search_path, saw_pragma_once. Remove all_include_files and
max_include_len. Make some members bool.
(_cpp_mark_only_only): Renamed from _cpp_never_reread.
(_cpp_stack_file): Renamed from _cpp_read_file.
(_cpp_stack_include): Renamed from _cpp_execute_include.
(_cpp_init_files): Renamed from _cpp_init_includes.
(_cpp_cleanup_files): Renamed from _cpp_cleanup_includes.
* cppinit.c (cpp_create_reader): Initialize no_search_path. Update.
(cpp_read_next_file): Rename and move to cppfiles.c.
(cpp_read_main_file): Update.
* cpplib.c (run_directive): Update for renamed members.
(do_include_common, _cpp_pop_buffer): Update.
(do_import): Undeprecate #import.
(do_pragma_once): Undeprecate. Use _cpp_mark_file_once_only.
* cpplib.h: Remove file_name_map_list.
(cpp_options): Remove map_list.
(cpp_dir): Rename from cpp_path. New datatype for name_map.
(cpp_set_include_chains, cpp_stack_file, cpp_included): Update.
testsuite:
* gcc.dg/cpp/include2.c: Only expect one message.
From-SVN: r69942
Diffstat (limited to 'gcc/c-opts.c')
| -rw-r--r-- | gcc/c-opts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/c-opts.c b/gcc/c-opts.c index 5061a58..44ac8dc 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1206,7 +1206,7 @@ c_common_parse_file (int set_yydebug ATTRIBUTE_UNUSED) /* Reset cpplib's macros and start a new file. */ cpp_undef_all (parse_in); - cpp_read_next_file (parse_in, in_fnames[file_index]); + cpp_stack_file (parse_in, in_fnames[file_index]); } finish_options(in_fnames[file_index]); |