* cppfiles.c (stack_include_file): Use MAX of sysp.

From-SVN: r40536

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86f69d1..9f2ce55 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-16  Alexandre Oliva  <aoliva@redhat.com>
+
+       * cppfiles.c (stack_include_file): Use MAX of sysp.
+
 2001-03-15  Steve Ellcey  <sje@cup.hp.com>
 
         * config.gcc (ia64*-*-hpux*): New case.

diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 434d3e4..1f7d899 100644 (file)
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -277,8 +277,8 @@ stack_include_file (pfile, inc)
 
   /* We'll try removing deps_sysp after the release of 3.0.  */
   deps_sysp = pfile->system_include_depth != 0;
-  sysp = ((pfile->buffer && pfile->buffer->sysp)
-         || (inc->foundhere && inc->foundhere->sysp));
+  sysp = MAX ((pfile->buffer ? pfile->buffer->sysp : 0),
+             (inc->foundhere ? inc->foundhere->sysp : 0));
 
   /* For -M, add the file to the dependencies on its first inclusion.  */
   if (CPP_OPTION (pfile, print_deps) > deps_sysp && !inc->include_count)