darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* strerror.c: Revert last change. Declare static sys_nerr

Browse source 
and sys_errlist using different names.
This commit is contained in:
Daniel Jacobowitz 2003-10-02 19:07:17 +00:00
parent 78ba4af6ad
commit e3b1168e9d
2 changed files with 7 additions and 8 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-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> 2003-10-01 Daniel Jacobowitz <drow@mvista.com>
* strerror.c: Don't provide or reference sys_errlist if * strerror.c: Don't provide or reference sys_errlist if

10
libiberty/strerror.c
View file

@ -7,7 +7,6 @@
#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
@ -17,17 +16,14 @@
#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. */
@ -464,9 +460,10 @@ 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
#define sys_nerr sys_nerr__
#define sys_errlist sys_errlist__
static int sys_nerr; static int sys_nerr;
static const char **sys_errlist; static const char **sys_errlist;
@ -475,7 +472,6 @@ static const char **sys_errlist;
extern int sys_nerr; extern int sys_nerr;
extern char *sys_errlist[]; extern char *sys_errlist[];
#endif
#endif #endif
/* /*
@ -542,7 +538,6 @@ 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
@ -563,7 +558,6 @@ init_error_tables ()
} }
#endif #endif
#endif
} }