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

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

gcc/ChangeLog

+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

gcc/c-opts.c

@@ -1440,9 +1440,13 @@ finish_options (const char *tif)
 
 	  if (opt->code == OPT_imacros
 	      && cpp_push_include (parse_in, opt->arg))
+	    {
+	      /* Disable push_command_line_include callback for now. */
+	      include_cursor = deferred_count + 1;
 	      cpp_scan_nooutput (parse_in);
 	    }
 	}
+    }
 
   include_cursor = 0;
   push_command_line_include ();