environ.h: Add #ifndef guard.

2017-05-19 Eli Zaretskii <eliz@gnu.org> * environ.h: Add #ifndef guard. From-SVN: r248308

environ.h: Add #ifndef guard.
2017-05-19 Eli Zaretskii <eliz@gnu.org> * environ.h: Add #ifndef guard. From-SVN: r248308
0ff0902b · Eli Zaretskii · DJ Delorie · 6deadc7d · 0ff0902b · 0ff0902b
Commit 0ff0902b authored May 20, 2017 by Eli Zaretskii Committed by DJ Delorie May 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

include/ChangeLog
+4 -0

include/environ.h
+2 -0

No files found.
--- a/include/ChangeLog
+++ b/include/ChangeLog
+2017-05-19  Eli Zaretskii <eliz@gnu.org>
+
+	* environ.h: Add #ifndef guard.
+
 2017-05-18  Martin Liska  <mliska@suse.cz>

 	* ansidecl.h: Define CONSTEXPR macro.

--- 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