merge trunk

2 files changed, 5 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fe90917a70b..4e3f3424c91 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rely on <config.h> + <unistd.h> to declare 'environ'.
+        * emacsclient.c (environ): Remove decl.
+
 2012-08-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in ($(BLD)/regex.$(O)): Update dependencies.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 20afe1cad11..07300dbf249 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1584,11 +1584,6 @@ main (int argc, char **argv)
   /* Send over our environment and current directory. */
   if (!current_frame)
     {
-#ifndef WINDOWSNT
-      /* This is defined in stdlib.h on MS-Windows.  It's defined in
-         unistd.h on some POSIX hosts, but not all (Bug#10155).  */
-      extern char **environ;
-#endif
       int i;
       for (i = 0; environ[i]; i++)
         {