c-opts.c (finish_options): Set include_cursor to disable premature calls to push_comm...

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5390fd84d212289bb6f56aef1374c6eaf40a368..ad5c2731b7e57b07e08f1d901e1ebc9029691af3 100644 (file)
--- 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 bbabe891b665f9372b1ddd816a81e567cde7c642..e6264ab5a0e0ff8bbb9616963ffcde1090b00c69 100644 (file)
--- 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);
+           }
        }
     }