From 11f6f21d465eb5e05ff2819ae58ae545c6e15e59 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 12 Jun 2001 13:16:43 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/strerror.c | 2 ++ libiberty/strsignal.c | 2 ++ 3 files changed, 10 insertions(+) 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 + + bootstrap/3106 + * strerror.c (sys_nerr): Hide the OS header version. + * strsignal.c (sys_nsig): Likewise. + 2001-06-10 Richard Henderson * 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 #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 #include @@ -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__ -- 2.7.4