From ef6e958a8611ff372211d0fd3cd9659614583bb4 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 4 Aug 2001 12:01:59 +0000 Subject: Makefile.in (CPPLIB_H): New, so that dependencies on cpplib.h are also on line-map.h. * Makefile.in (CPPLIB_H): New, so that dependencies on cpplib.h are also on line-map.h. * cppfiles.c (stack_include_file): Update. * cpphash.h (struct cpp_buffer): New member return_at_eof. (_cpp_pop_buffer): New. * cppinit.c (cpp_destroy, cpp_finish): Update. (do_includes): Mark each buffer to return at EOF. * cpplex.c (_cpp_lex_token): Pop buffers at EOF. Continue or return as requested. * cpplib.c (run_directive, do_line, cpp_push_buffer): Update. (cpp_pop_buffer): Rename _cpp_pop_buffer. Stop skipping. * cpplib.h (cpp_pop_buffer): Remove. (cpp_scan_buffer_nooutput): Rename cpp_scan_nooutput. * cppmacro.c (cpp_scan_buffer_nooutput): Similarly. No need to pop buffers. * cppmain.c (scan_buffer): Rename scan_translation_unit. No need to pop buffers. (do_preprocessing): Update. * fix-header.c (read_scan_file): Update. No need to pop buffers. * c-parse.in (_yylex): Similarly. * scan-decls.c (scan_decls): Similarly. * line-map.h: Update comments. * cp/spew.c (read_token): No need to pop buffers. * objc/Make-lang.in (objc-act.o): Update dependencies. From-SVN: r44634 --- gcc/cpplib.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gcc/cpplib.h') diff --git a/gcc/cpplib.h b/gcc/cpplib.h index bb91adb33eb..31c01e72c4f 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -554,8 +554,7 @@ extern void cpp_unassert PARAMS ((cpp_reader *, const char *)); extern cpp_buffer *cpp_push_buffer PARAMS ((cpp_reader *, const unsigned char *, size_t, enum cpp_buffer_type, - const char *)); -extern cpp_buffer *cpp_pop_buffer PARAMS ((cpp_reader *)); + const char *, int)); extern int cpp_defined PARAMS ((cpp_reader *, const unsigned char *, int)); /* N.B. The error-message-printer prototypes have not been nicely @@ -611,7 +610,7 @@ extern void cpp_forall_identifiers PARAMS ((cpp_reader *, cpp_cb, void *)); /* In cppmacro.c */ -extern void cpp_scan_buffer_nooutput PARAMS ((cpp_reader *, int)); +extern void cpp_scan_nooutput PARAMS ((cpp_reader *)); extern void cpp_start_lookahead PARAMS ((cpp_reader *)); extern void cpp_stop_lookahead PARAMS ((cpp_reader *, int)); extern int cpp_sys_macro_p PARAMS ((cpp_reader *)); -- cgit v1.2.1