aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2000-11-10 05:26:10 +0000
committerJeff Law <law@gcc.gnu.org>2000-11-09 22:26:10 -0700
commit59257980609435f68235bfb911ace85fa40215fa (patch)
treecfdee7342960db0d28a1bf4967780e8cb2278c9c
parent881a89697e1604663cb76e32abab1c2419fbcbc8 (diff)
downloadgcc-59257980609435f68235bfb911ace85fa40215fa.zip
gcc-59257980609435f68235bfb911ace85fa40215fa.tar.gz
gcc-59257980609435f68235bfb911ace85fa40215fa.tar.bz2
* c-lex.c [! NO_IMPLICIT_EXTERN_C] (cb_enter_file): Check
in_system_header and flags[1] before dereferencing flags[2]. From-SVN: r37361
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-lex.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 15ccecb..8b66f22 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-09 Hans-Peter Nilsson <hp@axis.com>
+
+ * c-lex.c [! NO_IMPLICIT_EXTERN_C] (cb_enter_file): Check
+ in_system_header and flags[1] before dereferencing flags[2].
+
2000-11-09 Matthew Hiller <hiller@redhat.com>
* reload1.c (reload_combine): Fixed calculation of
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 42b8c39..5117057 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -714,7 +714,7 @@ cb_enter_file (pfile)
#ifndef NO_IMPLICIT_EXTERN_C
if (c_header_level)
++c_header_level;
- else if (flags[2] != 0)
+ else if (in_system_header && flags[1] != 0 && flags[2] != 0)
{
c_header_level = 1;
++pending_lang_change;