* fix-header.c (read_scan_file): Defer switch processing.

From-SVN: r65216
This commit is contained in:
Neil Booth 2003-04-03 22:01:21 +00:00 committed by Neil Booth
parent d24ecd21b3
commit 7b43d10453
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2003-04-03 Neil Booth <neil@daikokuya.co.uk>
* fix-header.c (read_scan_file): Defer switch processing.
2003-04-03 Matt Austern <austern@apple.com>
* cpppch.c (reset_ht): Remove.

View File

@ -635,6 +635,11 @@ read_scan_file (in_fname, argc, argv)
if (! cpp_read_main_file (scan_in, in_fname))
exit (FATAL_EXIT_CODE);
cpp_change_file (scan_in, LC_RENAME, "<built-in>");
cpp_init_builtins (scan_in);
cpp_change_file (scan_in, LC_RENAME, in_fname);
/* Process switches after builtins so -D can override them. */
for (i = 0; i < argc; i += strings_processed)
{
strings_processed = 0;
@ -675,10 +680,6 @@ read_scan_file (in_fname, argc, argv)
true /* stdinc */, false /* cxx_stdinc */,
false /* verbose */);
cpp_change_file (scan_in, LC_RENAME, "<built-in>");
cpp_init_builtins (scan_in);
cpp_change_file (scan_in, LC_RENAME, in_fname);
/* We are scanning a system header, so mark it as such. */
cpp_make_system_header (scan_in, 1, 0);