diff options
| author | Per Bothner <pbothner@apple.com> | 2003-11-05 21:09:04 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-11-05 13:09:04 -0800 |
| commit | 9b49a0aaabd8e07d48bc4c50001acd2740db2e9e (patch) | |
| tree | 6f45ea10cc3b770af76f39b0e228d8dd47795cfb /gcc | |
| parent | 51672143903463e757bdc4acdace853717be9505 (diff) | |
| download | gcc-9b49a0aaabd8e07d48bc4c50001acd2740db2e9e.zip gcc-9b49a0aaabd8e07d48bc4c50001acd2740db2e9e.tar.gz gcc-9b49a0aaabd8e07d48bc4c50001acd2740db2e9e.tar.bz2 | |
c-opts.c (finish_options): Set include_cursor to disable premature calls to push_command_line_include from...
* c-opts.c (finish_options): Set include_cursor to disable premature
calls to push_command_line_include from cpp_scan_nooutput.
Fixes bug reported by DJ Delorie.
From-SVN: r73281
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-opts.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b5390fd..ad5c273 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-11-05 Per Bothner <pbothner@apple.com> + + * c-opts.c (finish_options): Set include_cursor to disable premature + calls to push_command_line_include from cpp_scan_nooutput. + Fixes bug reported by DJ Delorie. + 2003-11-05 Geoffrey Keating <geoffk@apple.com> * config/rs6000/rs6000.c (setup_incoming_varargs): Remove diff --git a/gcc/c-opts.c b/gcc/c-opts.c index bbabe89..e6264ab 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1440,7 +1440,11 @@ finish_options (const char *tif) if (opt->code == OPT_imacros && cpp_push_include (parse_in, opt->arg)) - cpp_scan_nooutput (parse_in); + { + /* Disable push_command_line_include callback for now. */ + include_cursor = deferred_count + 1; + cpp_scan_nooutput (parse_in); + } } } |