aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppinit.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ecdd9f..c992d2b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-16 Zack Weinberg <zack@codesourcery.com>
+
+ * cppinit.c (merge_include_chains): Check for brack being
+ NULL before attempting to merge it with qtail.
+
2002-02-16 Andrew Cagney <ac131313@redhat.com>
* config/rs6000/netbsd.h (PREFERRED_DEBUGGING_TYPE): Set to
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 717fb3f..b5ad937 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -376,7 +376,8 @@ merge_include_chains (pfile)
qtail->next = brack;
/* If brack == qtail, remove brack as it's simpler. */
- if (INO_T_EQ (qtail->ino, brack->ino) && qtail->dev == brack->dev)
+ if (brack && INO_T_EQ (qtail->ino, brack->ino)
+ && qtail->dev == brack->dev)
brack = remove_dup_dir (pfile, qtail);
}
else