cpplib: Unify dependency generation systemheader-ness

Neil Booth neil@daikokuya.demon.co.uk
Tue Aug 21 10:45:00 GMT 2001


Currently dependency generation uses a slightly different test of
system headerness to the rest of cpplib.  This was for no good reason
other than historical behaviour, but Zack and I didn't want to wait
for after 3.0.

So here it is for 3.1.

Neil.

	* cppfiles.c (stack_include_file): Harmonize system headerness tests.

Index: cppfiles.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cppfiles.c,v
retrieving revision 1.125
diff -u -p -r1.125 cppfiles.c
--- cppfiles.c	2001/08/17 22:23:47	1.125
+++ cppfiles.c	2001/08/21 17:12:40
@@ -286,16 +286,14 @@ stack_include_file (pfile, inc)
 {
   size_t len = 0;
   cpp_buffer *fp;
-  int sysp, deps_sysp;
+  int sysp;
   const char *filename;
 
-  /* We'll try removing deps_sysp after the release of 3.0.  */
-  deps_sysp = pfile->system_include_depth != 0;
   sysp = MAX ((pfile->map ? pfile->map->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)
+  if (CPP_OPTION (pfile, print_deps) > sysp && !inc->include_count)
     deps_add_dep (pfile->deps, inc->name);
 
   /* Not in cache?  */



More information about the Gcc-patches mailing list