* cpperror.c (print_location): Don't show _Pragma.

	* cppfiles.c (_cpp_pop_file_buffer): Handle -include file pushing
	and file change callback generation here.
	(stack_include_file): Update use of cpp_push_buffer.
	* cpphash.h (_cpp_pop_file_buffer): Update prototype.
	(struct cpp_buffer): Remove type, pfile members.
	* cppinit.c (cpp_handle_option): Use free_chain.
	* cpplex.c (_cpp_lex_token): Don't do -include file pushing here.
	(skip_escaped_newlines, get_effective_char, lex_percent): Take
	a cpp_reader rather than a cpp_buffer.
	(skip_escaped_newlines, get_effective_char, skip_block_comment,
	skip_line_comment, parse_string, lex_percent, lex_dot,
	_cpp_lex_token): Update accordingly.
	* cpplib.c (_cpp_pop_buffer): Don't do file change callback
	generation here.
	(cpp_push_buffer): Update prototype.
	(run_directive): Update use of cpp_push_buffer.
	(_cpp_do__Pragma, cpp_define, cpp_define_builtin, cpp_undef,
	handle_assertion): Update use of run_directive.
	* cpplib.h (enum cpp_buffer_type): Remove.
	(cpp_push_buffer): Update prototype.
	* fix-header.c (read_scan_file): Update.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45112 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 8 deletions

diff --git a/gcc/cpphash.h b/gcc/cpphash.h
index d9ebb983f09..a31368396ef 100644
--- a/gcc/cpphash.h
+++ b/gcc/cpphash.h
@@ -171,13 +171,12 @@ struct cpp_buffer
   cppchar_t read_ahead;		/* read ahead character */
   cppchar_t extra_char;		/* extra read-ahead for long tokens.  */
 
-  struct cpp_reader *pfile;	/* Owns this buffer.  */
   struct cpp_buffer *prev;
 
-  const unsigned char *buf;	 /* entire buffer */
+  const unsigned char *buf;	 /* Entire buffer.  */
 
-  /* Pointer into the include table.  Used for include_next and
-     to record control macros. */
+  /* Pointer into the include table; non-NULL if this is a file
+     buffer.  Used for include_next and to record control macros.  */
   struct include_file *inc;
 
   /* Value of if_stack at start of this file.
@@ -214,9 +213,6 @@ struct cpp_buffer
      token from the enclosing buffer is returned.  */
   bool return_at_eof;
 
-  /* Buffer type.  */
-  ENUM_BITFIELD (cpp_buffer_type) type : 8;
-
   /* The directory of the this buffer's file.  Its NAME member is not
      allocated, so we don't need to worry about freeing it.  */
   struct search_path dir;
@@ -391,7 +387,8 @@ extern int _cpp_compare_file_date       PARAMS ((cpp_reader *,
 extern void _cpp_report_missing_guards	PARAMS ((cpp_reader *));
 extern void _cpp_init_includes		PARAMS ((cpp_reader *));
 extern void _cpp_cleanup_includes	PARAMS ((cpp_reader *));
-extern void _cpp_pop_file_buffer	PARAMS ((cpp_reader *, cpp_buffer *));
+extern void _cpp_pop_file_buffer	PARAMS ((cpp_reader *,
+						 struct include_file *));
 
 /* In cppexp.c */
 extern int _cpp_parse_expr		PARAMS ((cpp_reader *));