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

gcc/ChangeLog

+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.

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);
 }
 

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);