From: Per Bothner <pbothner@apple.com>
Date: Wed, 5 Nov 2003 21:09:04 +0000 (+0000)
Subject: c-opts.c (finish_options): Set include_cursor to disable premature calls to push_comm... 
X-Git-Tag: releases/gcc-3.4.0~2487
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b49a0aaabd8e07d48bc4c50001acd2740db2e9e;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5390fd84d21..ad5c2731b7e5 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 bbabe891b665..e6264ab5a0e0 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);
+	    }
 	}
     }