OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Alexandre Oliva 2003-09-14 13:56:18 +00:00 committed by Alexandre Oliva
parent aab68b4aba
commit 7b9a5a662b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

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

5
gcc/c-lex.c
View File

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

4
gcc/c-ppoutput.c
View File

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