--- libiberty/strerror.c.orig	Fri May 15 19:42:41 1998
+++ libiberty/strerror.c	Wed Jan  6 12:10:40 1999
@@ -7,21 +7,12 @@
 
 #include "config.h"
 
-#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
-   incompatible with our later declaration, perhaps by using const
-   attributes.  So we hide the declaration in errno.h (if any) using a
-   macro. */
-#define sys_errlist sys_errlist__
-#endif
-
 #include <stdio.h>
 #include <errno.h>
 
-#ifdef HAVE_SYS_ERRLIST
-#undef sys_errlist
-#endif
+/* Bogus!  We have these. */
+#undef HAVE_SYS_ERRLIST
+#define HAVE_SYS_ERRLIST
 
 /*  Routines imported from standard C runtime libraries. */
 
@@ -459,11 +450,6 @@
 
 static int sys_nerr;
 static const char **sys_errlist;
-
-#else
-
-extern int sys_nerr;
-extern char *sys_errlist[];
 
 #endif