merge from gcc

[deliverable/binutils-gdb.git] / libiberty / strerror.c

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