re PR preprocessor/4890 (inconsistent int-to-pointer warning)

	PR preprocessor/4890
	* tradcpp.c (output_line_command): When leaving a file,
	system_include_depth has not yet been decremented.

From-SVN: r59010

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0f2422c2e9160b263d848d759465c5147f2618e..87a9c71974b0d2ac7c2515f7ca9a403dc6dc6e9d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-11  Neil Booth  <neil@daikokuya.co.uk>
+
+       PR preprocessor/4890
+       * tradcpp.c (output_line_command): When leaving a file,
+       system_include_depth has not yet been decremented.
+
 2002-11-10  Joel Sherrill <joel@gcc.gnu.org>
 
        * config/m68k/t-crtstuff (crti.o): Use this...

diff --git a/gcc/tradcpp.c b/gcc/tradcpp.c
index e696bf0f6738638ad4105adeb60824bb04789051..979179cb10bf0b47419fda20ae01cad4e3da5744 100644 (file)
--- a/gcc/tradcpp.c
+++ b/gcc/tradcpp.c
@@ -4104,7 +4104,7 @@ output_line_command (ip, op, conditional, file_change)
   sprintf (line_cmd_buf, "# %d \"%s\"", ip->lineno, ip->fname);
   if (file_change != same_file)
     strcat (line_cmd_buf, file_change == enter_file ? " 1" : " 2");
-  if (system_include_depth > 0)
+  if (system_include_depth > (file_change == leave_file))
     strcat (line_cmd_buf, " 3");
   len = strlen (line_cmd_buf);
   line_cmd_buf[len++] = '\n';