1 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e922ede7a0c..fa3eaa281d7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2012-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Rely on <unistd.h> to declare 'environ',
+        as gnulib does this if the system doesn't.
+        * callproc.c, editfns.c, process.c (environ) [!USE_CRT_DLL]:
+        * emacs.c (environ) [DOUG_LEA_MALLOC]:
+        * vm-limit.c (environ) [ORDINARY_LINK]: Remove decl.
+        * vm-limit.c: Include <unistd.h>, for 'environ'.
+
         * unexaix.c, unexcoff.c: Include "mem-limits.h".
         (start_of_data): Remove decl; mem-limits.h provides it.