From: Bruno Haible <bruno@clisp.org>
Date: Sat, 17 Sep 2011 15:34:03 +0000 (+0200)
Subject: putenv: Support for MSVC.
X-Git-Tag: v0.1~1887
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=c124cabd6716e4c57fde3b7d0d518fa61e25f12f;p=gnulib.git

putenv: Support for MSVC.

* modules/putenv (Depends-on): Add environ.
* lib/putenv.c (environ): Disable declaration.
* lib/unistd.in.h: Update comment.
---

diff --git a/ChangeLog b/ChangeLog
index 6b18485ce..ef3326460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-09-17  Bruno Haible  <bruno@clisp.org>
 
+	putenv: Support for MSVC.
+	* modules/putenv (Depends-on): Add environ.
+	* lib/putenv.c (environ): Disable declaration.
+	* lib/unistd.in.h: Update comment.
+
+2011-09-17  Bruno Haible  <bruno@clisp.org>
+
 	math: Avoid macro redefinition warnings on MSVC.
 	* lib/math.in.h (ceilf, ceill, floorf, floorl, frexpl, ldexpl):
 	Undefine before redefining.
diff --git a/lib/putenv.c b/lib/putenv.c
index 68e5fec31..3c332791b 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -34,10 +34,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_GNU_LD
+#if _LIBC
+# if HAVE_GNU_LD
 # define environ __environ
-#else
+# else
 extern char **environ;
+# endif
 #endif
 
 #if _LIBC
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 90de697e0..e3fb8c6b9 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -75,7 +75,8 @@
 #endif
 
 /* mingw fails to declare _exit in <unistd.h>.  */
-/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
+/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
+   <unistd.h>.  */
 /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
diff --git a/modules/putenv b/modules/putenv
index 7476af11a..3321a5e95 100644
--- a/modules/putenv
+++ b/modules/putenv
@@ -7,6 +7,7 @@ m4/putenv.m4
 
 Depends-on:
 stdlib
+environ         [test $REPLACE_PUTENV = 1]
 malloc-posix    [test $REPLACE_PUTENV = 1]
 
 configure.ac: