* cpplib.h (struct cpp_reader): New field include_depth.

	(struct cpp_printer): Rename last_bsd to last_id.
	* cppfiles.c (read_include_file): Bump include_depth.
	* cpplex.c (cpp_pop_buffer): Decrement include_depth.
	(output_line_command): Output correct #line if a header
	is including itself and is not protected against multiple inclusion.
	Use include_depth instead of buffer_stack_depth, last_id instead of
	last_bsd.
	* cppinit.c (cpp_start_read): Initialize last_id instead of
	last_bsd.


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

1 files changed, 4 insertions, 1 deletions

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 88efdf789bb..b14bb7870fe 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -492,6 +492,9 @@ struct cpp_reader
   /* Current depth of buffer stack. */
   unsigned int buffer_stack_depth;
 
+  /* Current depth in #include directives.  */
+  unsigned int include_depth;
+
   /* Hash table of macros and assertions.  See cpphash.c */
   struct htab *hashtab;
 
@@ -564,7 +567,7 @@ struct cpp_printer
 {
   FILE *outf;			/* stream to write to */
   const char *last_fname;	/* previous file name */
-  unsigned int last_bsd;	/* did we just push? */
+  unsigned int last_id;		/* did we just push? */
   unsigned int lineno;		/* line currently being written */
   unsigned int written;		/* low water mark in token buffer */
 };