environ is supposed to be declared by <unistd.h>.

diff --git a/ChangeLog b/ChangeLog
index a7ed3e2067d83987bc18cfc216fe60306e286632..2a401a1e05029f83e26123f32992fe7a766ea4d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-16  Bruno Haible  <bruno@clisp.org>
+
+       * lib/unistd.in.h: Add comment.
+       * tests/test-environ.c: Don't include <stdlib.h>.
+
 2008-12-16  Bruno Haible  <bruno@clisp.org>
 
        * lib/parse-duration.h (parse_duration): Document return value

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index fa8616a2a22bb91b67b3d9db554266c6ba22547a..05778f90ad153355d53e9969b328d8ff61b77e3e 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -35,6 +35,7 @@
 #endif
 
 /* mingw fails to declare _exit in <unistd.h>.  */
+/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
 #include <stdlib.h>
 
 #if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@

diff --git a/tests/test-environ.c b/tests/test-environ.c
index 3924288e80d734fa42de9f007514138cd046a237..d9501bbdafaae05bf04fbe516d506939525f0bc1 100644 (file)
--- a/tests/test-environ.c
+++ b/tests/test-environ.c
@@ -20,7 +20,6 @@
 
 #include <unistd.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 int