OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

strerror.c: Don't provide or reference sys_errlist if strerror is available.

Browse Source 
* strerror.c: Don't provide or reference sys_errlist if
	strerror is available.

From-SVN: r72001
This commit is contained in:
Daniel Jacobowitz 2003-10-01 23:12:37 +00:00 committed by Daniel Jacobowitz
parent b2218cc139
commit b9e8f4b38e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libiberty/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-01 Daniel Jacobowitz <drow@mvista.com>
* strerror.c: Don't provide or reference sys_errlist if
strerror is available.
2003-10-01 H.J. Lu <hongjiu.lu@intel.com> 2003-10-01 H.J. Lu <hongjiu.lu@intel.com>
* configure.in: Check if $MAKEINFO is missing. * configure.in: Check if $MAKEINFO is missing.

9
libiberty/strerror.c
View File

@ -7,6 +7,7 @@
#include "config.h" #include "config.h"
#ifndef HAVE_STRERROR
#ifdef HAVE_SYS_ERRLIST #ifdef HAVE_SYS_ERRLIST
/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least) /* 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 might declare sys_errlist in a way that the compiler might consider
@ -16,14 +17,17 @@
#define sys_nerr sys_nerr__ #define sys_nerr sys_nerr__
#define sys_errlist sys_errlist__ #define sys_errlist sys_errlist__
#endif #endif
#endif
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifndef HAVE_STRERROR
#ifdef HAVE_SYS_ERRLIST #ifdef HAVE_SYS_ERRLIST
#undef sys_nerr #undef sys_nerr
#undef sys_errlist #undef sys_errlist
#endif #endif
#endif
/* Routines imported from standard C runtime libraries. */ /* Routines imported from standard C runtime libraries. */
@ -460,6 +464,7 @@ static int num_error_names = 0;
same name, it differs from other implementations in that it is dynamically same name, it differs from other implementations in that it is dynamically
initialized rather than statically initialized. */ initialized rather than statically initialized. */
#ifndef HAVE_STRERROR
#ifndef HAVE_SYS_ERRLIST #ifndef HAVE_SYS_ERRLIST
static int sys_nerr; static int sys_nerr;
@ -471,7 +476,7 @@ extern int sys_nerr;
extern char *sys_errlist[]; extern char *sys_errlist[];
#endif #endif
#endif
/* /*
@ -537,6 +542,7 @@ init_error_tables ()
} }
} }
#ifndef HAVE_STRERROR
#ifndef HAVE_SYS_ERRLIST #ifndef HAVE_SYS_ERRLIST
/* Now attempt to allocate the sys_errlist table, zero it out, and then /* Now attempt to allocate the sys_errlist table, zero it out, and then
@ -557,6 +563,7 @@ init_error_tables ()
} }
#endif #endif
#endif
} }