diff options
| author | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
| commit | e5e809f4194e578b5fbd48fc5a1df2377f28d197 (patch) | |
| tree | 6743f11e58bd7a933b08900d973d89026cd11c43 /gcc/cpplib.c | |
| parent | 31031eddacda46a500b2390f52cd4474bcaf84ca (diff) | |
| download | gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.zip gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.gz gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.bz2 | |
* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12
for details.
* haifa-sched.c: Mirror recent changes from gcc2.
From-SVN: r18984
Diffstat (limited to 'gcc/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 8528861..bd68911 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -1,5 +1,5 @@ /* CPP Library. - Copyright (C) 1986, 87, 89, 92-7, 1998 Free Software Foundation, Inc. + Copyright (C) 1986, 87, 89, 92-97, 1998 Free Software Foundation, Inc. Contributed by Per Bothner, 1994-95. Based on CCCP program by Paul Rubin, June 1986 Adapted to ANSI C, Richard Stallman, Jan 1987 @@ -369,7 +369,8 @@ struct directive { char command_reads_line; /* One if rest of line is read by func. */ }; -#define IS_INCLUDE_DIRECTIVE_TYPE(t) (T_INCLUDE <= (t) && (t) <= T_IMPORT) +#define IS_INCLUDE_DIRECTIVE_TYPE(t) \ +((int) T_INCLUDE <= (int) (t) && (int) (t) <= (int) T_IMPORT) /* Here is the actual list of #-directives, most-often-used first. The initialize_builtins function assumes #define is the very first. */ @@ -7494,6 +7495,7 @@ cpp_error_from_errno (pfile, name) cpp_reader *pfile; char *name; { + int e = errno; cpp_buffer *ip = cpp_file_buffer (pfile); cpp_print_containing_files (pfile); @@ -7501,7 +7503,7 @@ cpp_error_from_errno (pfile, name) if (ip != NULL) cpp_file_line_for_message (ip->nominal_fname, ip->lineno, -1); - cpp_message (pfile, 1, "%s: %s", name, my_strerror (errno)); + cpp_message (pfile, 1, "%s: %s", name, my_strerror (e)); } void |