From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 10 Nov 2000 05:26:10 +0000 (+0000)
Subject:         * c-lex.c [! NO_IMPLICIT_EXTERN_C] (cb_enter_file): Check
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c95dbf51f5e8b47dd014820b8fa8aa83b5cd1fa;p=thirdparty%2Fgcc.git

    * c-lex.c [! NO_IMPLICIT_EXTERN_C] (cb_enter_file): Check
        in_system_header and flags[1] before dereferencing flags[2].


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37361 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 15ccecbd516f..8b66f22936ac 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 42b8c3978dad..51170573c57b 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;