--- gcc-2.95.3/libiberty/strerror.c 1998-05-16 01:42:41.000000000 +0200 +++ gcc-2.95.3/libiberty/strerror.c 2012-08-04 11:53:28.000000000 +0200 @@ -7,6 +7,8 @@ #include "config.h" +#define HAVE_SYS_ERRLIST + #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 @@ -27,8 +29,10 @@ #ifdef __STDC__ #include +#ifndef __APPLE__ extern void *malloc (size_t size); /* 4.10.3.3 */ extern void *memset (void *s, int c, size_t n); /* 4.11.6.1 */ +#endif #else /* !__STDC__ */ extern char *malloc (); /* Standard memory allocater */ extern char *memset (); @@ -462,8 +466,12 @@ #else +#ifdef __APPLE__ +extern const int sys_nerr; +#else extern int sys_nerr; -extern char *sys_errlist[]; +#endif +extern const char *const sys_errlist[]; #endif