diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-11 14:54:56 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-11 14:54:56 +0000 |
| commit | 37734e2c97fa58f69db5e4a93a1d0a0293a2b0cb (patch) | |
| tree | 90bc59f78cb853a4f69621cb5dabb8f5ad352a1c | |
| parent | b8537e383bd8e885126ebe91f59b02633b4d3ae9 (diff) | |
| download | gcc-37734e2c97fa58f69db5e4a93a1d0a0293a2b0cb.tar.gz | |
* cppfiles.c (INCLUDE_LEN_FUDGE, ENOMEM): Delete.
(cpp_included, find_include_file): Update.
(_cpp_compare_file_date): Make else unconditional.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40388 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cppfiles.c | 15 |
2 files changed, 9 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 972a5c64e0e..672d8e777ad 100644 --- 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 b9c03d055f1..e4d8ec1ea9c 100644 --- 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); |