From: Alexandre Oliva <aoliva@redhat.com>
Date: Sun, 14 Sep 2003 13:56:18 +0000 (+0000)
Subject: c-ppoutput.c (cb_line_change): Revert 2003-08-04's change.
X-Git-Tag: releases/gcc-3.4.0~3743
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b9a5a662b243ee413626bbc14a87bbea25e633c;p=thirdparty%2Fgcc.git

c-ppoutput.c (cb_line_change): Revert 2003-08-04's change.

* c-ppoutput.c (cb_line_change): Revert 2003-08-04's change.
* c-lex.c (cb_line_change): Skip line changing whenever
c-ppoutput.c would.

From-SVN: r71381
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 903db9b2f3fd..d0e68ae82f03 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-14  Alexandre Oliva  <aoliva@redhat.com>
+
+	* c-ppoutput.c (cb_line_change): Revert 2003-08-04's change.
+	* c-lex.c (cb_line_change): Skip line changing whenever
+	c-ppoutput.c would.
+
 2003-09-14  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* ra.c: Convert to ISO C90 prototypes.
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index c9c69a68be09..2109eff1da93 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -197,8 +197,11 @@ cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED,
    lexed token on the line.  Used for diagnostic line numbers.  */
 static void
 cb_line_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const cpp_token *token,
-		int parsing_args ATTRIBUTE_UNUSED)
+		int parsing_args)
 {
+  if (token->type == CPP_EOF || parsing_args)
+    return;
+
   src_lineno = SOURCE_LINE (map, token->line);
 }
 
diff --git a/gcc/c-ppoutput.c b/gcc/c-ppoutput.c
index 68b45d2f517d..9642f306cace 100644
--- a/gcc/c-ppoutput.c
+++ b/gcc/c-ppoutput.c
@@ -261,9 +261,9 @@ print_line (const struct line_map *map, unsigned int line, const char *special_f
    of the line, and at end of file will be CPP_EOF.  */
 static void
 cb_line_change (cpp_reader *pfile, const cpp_token *token,
-		int parsing_args ATTRIBUTE_UNUSED)
+		int parsing_args)
 {
-  if (token->type == CPP_EOF)
+  if (token->type == CPP_EOF || parsing_args)
     return;
 
   maybe_print_line (print.map, token->line);