From: Neil Booth <neil@daikokuya.co.uk>
Date: Mon, 11 Nov 2002 06:38:48 +0000 (+0000)
Subject: re PR preprocessor/4890 (inconsistent int-to-pointer warning)
X-Git-Tag: releases/gcc-3.2.1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5c7f3a233c6c7bea365b2b389846f9ef304f423;p=thirdparty%2Fgcc.git

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 d0f2422c2e91..87a9c71974b0 100644
--- 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 e696bf0f6738..979179cb10bf 100644
--- 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';