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

	and sys_errlist using different names.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 40aea276a8e64833d982f0a6c18755dc22c83ff5..b01e41067d9314d4ca9b209a33744e5cdeb787c2 100644 (file)
--- 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 bee9bfc2490ae8fd55280c9187d7a4a08068436a..83a5992b4dd91f665729248e01d9f45a45404b40 100644 (file)
--- 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;
 
@@ -475,7 +472,6 @@ static const char **sys_errlist;
 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
 
 }