diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2003-03-15 15:02:16 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2003-03-15 15:02:16 +0000 |
| commit | 151c68c36f3c591d162f7aab74d38ee7384f9f3d (patch) | |
| tree | 6eec0dbaae970a3f8d706fe7536ba1c0ee8e73c8 /gcc | |
| parent | 511e3684c16962582169378ac01c8a87355a45f2 (diff) | |
| download | gcc-151c68c36f3c591d162f7aab74d38ee7384f9f3d.zip gcc-151c68c36f3c591d162f7aab74d38ee7384f9f3d.tar.gz gcc-151c68c36f3c591d162f7aab74d38ee7384f9f3d.tar.bz2 | |
* fix-header.c (read_scan_file): Read main file before handling -D.
From-SVN: r64404
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fix-header.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7320557..b42a392 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2003-03-15 Neil Booth <neil@daikokuya.co.uk> + + * fix-header.c (read_scan_file): Read main file before handling -D. + 2003-03-15 Roger Sayle <roger@eyesopen.com> * c-cppbuiltin.c (builtin_define_with_value_n): Fix whitespace. diff --git a/gcc/fix-header.c b/gcc/fix-header.c index 36e1d7c..f58df6e 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -632,6 +632,9 @@ read_scan_file (in_fname, argc, argv) options->inhibit_warnings = 1; options->inhibit_errors = 1; + if (! cpp_read_main_file (scan_in, in_fname, NULL)) + exit (FATAL_EXIT_CODE); + for (i = 0; i < argc; i += strings_processed) { strings_processed = 0; @@ -669,8 +672,6 @@ read_scan_file (in_fname, argc, argv) register_include_chains (scan_in, NULL /* sysroot */, NULL /* iprefix */, true /* stdinc */, false /* cxx_stdinc */, false /* verbose */); - if (! cpp_read_main_file (scan_in, in_fname, NULL)) - exit (FATAL_EXIT_CODE); cpp_rename_file (scan_in, "<built-in>"); cpp_init_builtins (scan_in); |