merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 12b17eee57818f1b814d24643900969b107c88d2..ca56d3541c900579e46380c3a731b749230e6264 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Loren J. Rittle  <ljrittle@acm.org>
+
+       bootstrap/3106
+       * strerror.c (sys_nerr): Hide the OS header version.
+       * strsignal.c (sys_nsig): Likewise.
+
 2001-06-10  Richard Henderson  <rth@redhat.com>
 
        * concat.c: Include string.h.  Fix int vs size_t usage.

diff --git a/libiberty/strerror.c b/libiberty/strerror.c
index 0dd2220cd73d88840b7e8f003a6484768f10e55e..ba837e32332071f6ad54e483e9d1eaf17bfb3563 100644 (file)
--- a/libiberty/strerror.c
+++ b/libiberty/strerror.c
@@ -13,6 +13,7 @@
    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_nerr sys_nerr__
 #define sys_errlist sys_errlist__
 #endif
 
@@ -20,6 +21,7 @@
 #include <errno.h>
 
 #ifdef HAVE_SYS_ERRLIST
+#undef sys_nerr
 #undef sys_errlist
 #endif
 

diff --git a/libiberty/strsignal.c b/libiberty/strsignal.c
index 5625323b71b30ed699849eab41dc9b46b9d82280..2533adce2979385ebc57f6a4c5ae99e9fd26839b 100644 (file)
--- a/libiberty/strsignal.c
+++ b/libiberty/strsignal.c
@@ -17,6 +17,7 @@
    ignore any declaration in the system header files, and always
    declare it ourselves.  With luck, this will always work.  */
 #define sys_siglist no_such_symbol
+#define sys_nsig sys_nsig__no_such_symbol
 
 #include <stdio.h>
 #include <signal.h>
@@ -38,6 +39,7 @@ extern PTR memset ();
 /* Undefine the macro we used to hide the definition of sys_siglist
    found in the system header files.  */
 #undef sys_siglist
+#undef sys_nsig
 
 #ifndef NULL
 #  ifdef __STDC__