aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2001-06-12 13:16:43 +0000
committerDJ Delorie <dj@redhat.com>2001-06-12 13:16:43 +0000
commit11f6f21d465eb5e05ff2819ae58ae545c6e15e59 (patch)
tree9c3430ebe390b01cffd4436563b85969e0c396cb
parent6fc1282450dd2fecc369ea820a2b04dcf45dc000 (diff)
downloadgdb-11f6f21d465eb5e05ff2819ae58ae545c6e15e59.zip
gdb-11f6f21d465eb5e05ff2819ae58ae545c6e15e59.tar.gz
gdb-11f6f21d465eb5e05ff2819ae58ae545c6e15e59.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/strerror.c2
-rw-r--r--libiberty/strsignal.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 12b17ee..ca56d35 100644
--- 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 0dd2220..ba837e3 100644
--- 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 5625323..2533adc 100644
--- 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__