From 3eb3f2935df168e82ed9808d3ebeb8ffdfc95e88 Mon Sep 17 00:00:00 2001 From: zack Date: Sat, 5 Jun 2004 20:58:06 +0000 Subject: libcpp: * Makefile.am: Add makedepend. * Makefile.in, aclocal.m4: Regenerate. * charset.c: Insert a space to avoid a warning. * directives.c: Include mkdeps.h. (_cpp_handle_directive): Reenable macro expander if appropriate. (undefine_macros): Inline body of _cpp_free_definition for speed. Do not call undef callback or _cpp_warn_if_unused_macro. (cpp_get_deps): New interface. * files.c (search_cache): Add pfile argument. Check for file that would be found by "" or <> search here... (_cpp_find_file): ...not here. Correct recorded start_dir of files found by directory-of-current-file search that would be found by "" or <> search. * init.c (cpp_add_dependency_target): Delete. * internal.h (struct lexer_state): Add discarding_output flag. * lex.c (lex_identifier): Compute hash function while scanning. * macro.c (cpp_scan_nooutput): Disable macro expansion outside directives. * makedepend.c: New file. * mkdeps.c (struct deps): Add vpath vector. (apply_vpath, deps_add_vpath): New function. (deps_free): Free vpath vector. (deps_add_dep, deps_add_target): Use apply_vpath. * symtab.c (calc_hash): Use HT_HASHSTEP and HT_FINISH. (ht_lookup_with_hash): New function. * cpplib.h, mkdeps.h: Update prototypes. * symtab.h: Update prototypes. (HT_HASHSTEP, HT_FINISH): New macros. gcc: * Makefile.in (MKDEPS_H): New shorthand. (c-opts.o): Update dependencies. * c-opts.c: Include mkdeps.h. (handle_deferred_opts): Use cpp_get_deps and deps_add_target, not cpp_add_dependency_target. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82654 138bc75d-0d04-0410-961f-82ee72b054a4 --- libcpp/macro.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libcpp/macro.c') diff --git a/libcpp/macro.c b/libcpp/macro.c index 842c15c38f0..cfc42b4050f 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -1142,12 +1142,18 @@ cpp_scan_nooutput (cpp_reader *pfile) transparently continuing with the including file. */ pfile->buffer->return_at_eof = true; + pfile->state.discarding_output++; + pfile->state.prevent_expansion++; + if (CPP_OPTION (pfile, traditional)) while (_cpp_read_logical_line_trad (pfile)) ; else while (cpp_get_token (pfile)->type != CPP_EOF) ; + + pfile->state.discarding_output--; + pfile->state.prevent_expansion--; } /* Step back one (or more) tokens. Can only step mack more than 1 if -- cgit v1.2.3