Fix MinGW compilation warnings due to environ.h

include/ChangeLog:

2017-05-31  Eli Zaretskii <eliz@gnu.org>

	* environ.h: Add #ifndef guard.

diff --git a/include/ChangeLog b/include/ChangeLog
index 1ec91cdc264ed2372dc3a0e7dc0439031ebfac9e..c1fdb8ea65d05f177ba22e72823885b9c208b0c0 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-31  Eli Zaretskii <eliz@gnu.org>
+
+       * environ.h: Add #ifndef guard.
+
 2017-05-30  Anton Kolesov  <anton.kolesov@synopsys.com>
 
        * elf/arc-cpu.def: New file.

diff --git a/include/environ.h b/include/environ.h
index 326a27812db2bdd1562dad00a121c070d3d41d89..32bb0b155c98eaf0170e15e90fd626e143968491 100644 (file)
--- a/include/environ.h
+++ b/include/environ.h
@@ -27,7 +27,9 @@ Boston, MA 02110-1301, USA.  */
 #     include <crt_externs.h>
 #     define environ (*_NSGetEnviron ())
 #  else
+#    ifndef environ
 extern char **environ;
+#    endif
 #  endif
 #  define HAVE_ENVIRON_DECL
 #endif