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

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f02db93f8eb3306d6e4eaeef93b2729db7fd4eb4..651f8a9a5f0dfee6a7da61a72d641a2c7b49f0c7 100644 (file)
--- 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 96917d5769f484e8f923de5ec75278b4319be6fe..714ca0a407687e9be46c3da4427f974186a2b9f1 100644 (file)
--- 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