cppfiles.c (INCLUDE_LEN_FUDGE, ENOMEM): Delete.

        * cppfiles.c (INCLUDE_LEN_FUDGE, ENOMEM): Delete.
	(cpp_included, find_include_file): Update.
	(_cpp_compare_file_date): Make else unconditional.

From-SVN: r40388

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 972a5c64e0e1dbd6da4018ca66db0b6e48fcfcdd..672d8e777ad1577b259eb3220bff0af6a9ec38da 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-11  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * cppfiles.c (INCLUDE_LEN_FUDGE, ENOMEM): Delete.
+       (cpp_included, find_include_file): Update.
+       (_cpp_compare_file_date): Make else unconditional.
+
 2001-03-10  kaz Kojima <kkojima@rr.iij4u.or.jp>
 
        * config/sh/sh.h (LEGITIMATE_PIC_OPERAND_P): Defined.

diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index b9c03d055f1f21e343dd3e8e044f938d63fd0dd7..e4d8ec1ea9c197a42640fdcee5a6f105dc9775a2 100644 (file)
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -43,10 +43,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # define O_BINARY 0
 #endif
 
-#ifndef INCLUDE_LEN_FUDGE
-# define INCLUDE_LEN_FUDGE 0
-#endif
-
 /* If errno is inspected immediately after a system call fails, it will be
    nonzero, and no error number will ever be zero.  */
 #ifndef ENOENT
@@ -55,9 +51,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef ENOTDIR
 # define ENOTDIR 0
 #endif
-#ifndef ENOMEM
-# define ENOMEM 0
-#endif
 
 /* Suppress warning about function macros used w/o arguments in traditional
    C.  It is unlikely that glibc's strcmp macro helps this file at all.  */
@@ -469,8 +462,7 @@ cpp_included (pfile, fname)
     }
       
   /* Search directory path for the file.  */
-  name = (char *) alloca (strlen (fname) + pfile->max_include_len
-                         + 2 + INCLUDE_LEN_FUDGE);
+  name = (char *) alloca (strlen (fname) + pfile->max_include_len + 2);
   for (path = CPP_OPTION (pfile, quote_include); path; path = path->next)
     {
       memcpy (name, path->name, path->len);
@@ -505,8 +497,7 @@ find_include_file (pfile, fname, search_start)
     return open_file (pfile, fname);
       
   /* Search directory path for the file.  */
-  name = (char *) alloca (strlen (fname) + pfile->max_include_len
-                         + 2 + INCLUDE_LEN_FUDGE);
+  name = (char *) alloca (strlen (fname) + pfile->max_include_len + 2);
   for (path = search_start; path; path = path->next)
     {
       memcpy (name, path->name, path->len);
@@ -723,7 +714,7 @@ _cpp_compare_file_date (pfile, f)
 
   if (f->type == CPP_HEADER_NAME)
     search_start = CPP_OPTION (pfile, bracket_include);
-  else if (CPP_OPTION (pfile, ignore_srcdir))
+  else
     search_start = pfile->buffer->search_from;
 
   inc = find_include_file (pfile, fname, search_start);