summaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorbrobecke <brobecke@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-19 15:28:56 +0000
committerbrobecke <brobecke@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-19 15:28:56 +0000
commitb3040cfb06aace7950b41e8849d62b579668b992 (patch)
treea685b4804ecf03f52ffe7486c24f153d48b9708f /libiberty
parent85fbea9709061ce97395dec59cddefcc62e787a9 (diff)
downloadgcc-b3040cfb06aace7950b41e8849d62b579668b992.tar.gz
strerror.c: Do not declare sys_nerr or sys_errlist if already macros
This fixes a MinGW warning in libiberty/strerror.c 2015-01-19 Eli Zaretskii <eliz@gnu.org> * strerror.c <sys_nerr, sys_errlist>: Declare only if they aren't macros. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219849 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/strerror.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ac2387552ed..22e3f8504b3 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-19 Eli Zaretskii <eliz@gnu.org>
+
+ * strerror.c <sys_nerr, sys_errlist>: Declare only if they aren't
+ macros.
+
2014-12-24 Uros Bizjak <ubizjak@gmail.com>
Ben Elliston <bje@au.ibm.com>
Manuel Lopez-Ibanez <manu@gcc.gnu.org>
diff --git a/libiberty/strerror.c b/libiberty/strerror.c
index 0efadc3d65e..a8a0bd1f7e2 100644
--- a/libiberty/strerror.c
+++ b/libiberty/strerror.c
@@ -469,8 +469,13 @@ static const char **sys_errlist;
#else
+
+#ifndef sys_nerr
extern int sys_nerr;
+#endif
+#ifndef sys_errlist
extern char *sys_errlist[];
+#endif
#endif