Commit 0e500c78 by Jakub Jelinek

Back it out temporarily.

From-SVN: r34767
parent 9d1d9b4f
...@@ -289,16 +289,15 @@ output_line_command (pfile, print, line) ...@@ -289,16 +289,15 @@ output_line_command (pfile, print, line)
if (CPP_OPTION (pfile, no_line_commands)) if (CPP_OPTION (pfile, no_line_commands))
return; return;
if (pfile->buffer_stack_depth == print->last_bsd)
{
/* Determine whether the current filename has changed, and if so, /* Determine whether the current filename has changed, and if so,
how. 'nominal_fname' values are unique, so they can be compared how. 'nominal_fname' values are unique, so they can be compared
by comparing pointers. */ by comparing pointers. */
if (ip->nominal_fname == print->last_fname) if (ip->nominal_fname == print->last_fname)
change = same; change = same;
else else
{
if (pfile->buffer_stack_depth == print->last_bsd)
change = rname; change = rname;
}
else else
{ {
if (pfile->buffer_stack_depth > print->last_bsd) if (pfile->buffer_stack_depth > print->last_bsd)
...@@ -308,7 +307,7 @@ output_line_command (pfile, print, line) ...@@ -308,7 +307,7 @@ output_line_command (pfile, print, line)
print->last_bsd = pfile->buffer_stack_depth; print->last_bsd = pfile->buffer_stack_depth;
} }
print->last_fname = ip->nominal_fname; print->last_fname = ip->nominal_fname;
}
/* If the current file has not changed, we can output a few newlines /* If the current file has not changed, we can output a few newlines
instead if we want to increase the line number by a small amount. instead if we want to increase the line number by a small amount.
We cannot do this if print->lineno is zero, because that means we We cannot do this if print->lineno is zero, because that means we
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment