summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>2003-07-15 05:36:25 +0000
committergeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>2003-07-15 05:36:25 +0000
commit26670692aec89fee6955896cd2034ce66c787f66 (patch)
tree092bbd76f1b7df463263b0f9ad375df6c727fe4b
parented922fcaa9108acc9a3e0cf6edd8efb8865206db (diff)
downloadgcc-26670692aec89fee6955896cd2034ce66c787f66.tar.gz
* c-opts.c (push_command_line_include): Don't free deferred_opts,
we'll need it. (finish_options): Reset init_cursor. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69381 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-opts.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5fc6fee46a1..c640b7badca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-14 Geoffrey Keating <geoffk@apple.com>
+
+ * c-opts.c (push_command_line_include): Don't free deferred_opts,
+ we'll need it.
+ (finish_options): Reset init_cursor.
+
2003-07-15 Kazu Hirata <kazu@cs.umass.edu>
* expr.c (expand_assignment): Remove an unused argument
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index bf60504bab7..5bc88f92d28 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1418,6 +1418,7 @@ finish_options (void)
}
}
+ include_cursor = 0;
push_command_line_include ();
}
@@ -1438,7 +1439,6 @@ push_command_line_include (void)
if (include_cursor == deferred_count)
{
- free (deferred_opts);
/* Restore the line map from <command line>. */
cpp_change_file (parse_in, LC_RENAME, main_input_filename);
/* -Wunused-macros should only warn about macros defined hereafter. */