(finclude): Increment indepth before calling
trigraph_pcp, so that warning uses the correct file name. From-SVN: r1901
This commit is contained in:
parent
b2796a4bdd
commit
cd1ceb3ca5
@ -4084,6 +4084,12 @@ finclude (f, fname, op, system_header_p, dirptr)
|
|||||||
/* Close descriptor now, so nesting does not use lots of descriptors. */
|
/* Close descriptor now, so nesting does not use lots of descriptors. */
|
||||||
close (f);
|
close (f);
|
||||||
|
|
||||||
|
/* Must do this before calling trigraph_pcp, so that the correct file name
|
||||||
|
will be printed in warning messages. */
|
||||||
|
|
||||||
|
indepth++;
|
||||||
|
input_file_stack_tick++;
|
||||||
|
|
||||||
if (!no_trigraphs)
|
if (!no_trigraphs)
|
||||||
trigraph_pcp (fp);
|
trigraph_pcp (fp);
|
||||||
|
|
||||||
@ -4095,9 +4101,6 @@ finclude (f, fname, op, system_header_p, dirptr)
|
|||||||
}
|
}
|
||||||
fp->buf[fp->length] = '\0';
|
fp->buf[fp->length] = '\0';
|
||||||
|
|
||||||
indepth++;
|
|
||||||
input_file_stack_tick++;
|
|
||||||
|
|
||||||
output_line_command (fp, op, 0, enter_file);
|
output_line_command (fp, op, 0, enter_file);
|
||||||
rescan (op, 0);
|
rescan (op, 0);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user