From ffa176b09bd381da7820cb1ba9141cdb7e43a7aa Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 22 Apr 2015 19:34:06 +0000
Subject: [PATCH] libiberty/setenv.c: Do not declare environ if defined as a
 macro.

2015-04-22  Eli Zaretskii  <eliz@gnu.org>

        * strerror.c <sys_nerr, sys_errlist>: Declare only if they aren't
        macros.
        * setenv.c <environ>: Declare only if not a macro.

From-SVN: r222335
---
 libiberty/ChangeLog | 4 ++++
 libiberty/setenv.c  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f02db93f8eb..651f8a9a5f0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* setenv.c <environ>: Declare only if not a macro.
+
 2015-04-14  Max Ostapenko  <m.ostapenko@partner.samsung.com>
 
 	* testsuite/Makefile.in (LIBCFLAGS): Add LDFLAGS.
diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 96917d5769f..714ca0a4076 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -63,8 +63,10 @@ extern int errno;
 
 #define __environ	environ
 #ifndef HAVE_ENVIRON_DECL
+#ifndef environ
 extern char **environ;
 #endif
+#endif
 
 #undef setenv
 #undef unsetenv
-- 
2.30.2