libiberty/setenv.c: Do not declare environ if defined as a macro.

Otherwise, it causes a build warning on some platforms such as MinGW.

libiberty/ChangeLog (Eli Zaretskii  <eliz@gnu.org>):

        * setenv.c <environ>: Declare only if not a macro.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 22e3f85..5009807 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-01-19  Eli Zaretskii  <eliz@gnu.org>
 
        * strerror.c <sys_nerr, sys_errlist>: Declare only if they aren't

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 96917d5..714ca0a 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