diff options
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/strerror.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 40aea27..b01e410 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2003-10-02 Daniel Jacobowitz <drow@mvista.com> + + * strerror.c: Revert last change. Declare static sys_nerr + and sys_errlist using different names. + 2003-10-01 Daniel Jacobowitz <drow@mvista.com> * strerror.c: Don't provide or reference sys_errlist if diff --git a/libiberty/strerror.c b/libiberty/strerror.c index bee9bfc..83a5992 100644 --- a/libiberty/strerror.c +++ b/libiberty/strerror.c @@ -7,7 +7,6 @@ #include "config.h" -#ifndef HAVE_STRERROR #ifdef HAVE_SYS_ERRLIST /* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least) might declare sys_errlist in a way that the compiler might consider @@ -17,17 +16,14 @@ #define sys_nerr sys_nerr__ #define sys_errlist sys_errlist__ #endif -#endif #include <stdio.h> #include <errno.h> -#ifndef HAVE_STRERROR #ifdef HAVE_SYS_ERRLIST #undef sys_nerr #undef sys_errlist #endif -#endif /* Routines imported from standard C runtime libraries. */ @@ -464,9 +460,10 @@ static int num_error_names = 0; same name, it differs from other implementations in that it is dynamically initialized rather than statically initialized. */ -#ifndef HAVE_STRERROR #ifndef HAVE_SYS_ERRLIST +#define sys_nerr sys_nerr__ +#define sys_errlist sys_errlist__ static int sys_nerr; static const char **sys_errlist; @@ -476,7 +473,6 @@ extern int sys_nerr; extern char *sys_errlist[]; #endif -#endif /* @@ -542,7 +538,6 @@ init_error_tables () } } -#ifndef HAVE_STRERROR #ifndef HAVE_SYS_ERRLIST /* Now attempt to allocate the sys_errlist table, zero it out, and then @@ -563,7 +558,6 @@ init_error_tables () } #endif -#endif } |