From: Chong Yidong <cyd@gnu.org>
Date: Wed, 30 Nov 2011 08:13:05 +0000 (+0800)
Subject: * emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155).
X-Git-Tag: emacs-pretest-24.0.92~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7308292aaa7f16a5670a151b6112239691ea61f;p=emacs.git

* emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155).
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index db1464f65d8..1eb67eb6c71 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-30  Chong Yidong  <cyd@gnu.org>
+
+	* emacsclient.c (main): Condition last change on WINDOWSNT
+	(Bug#10155).
+
 2011-11-27  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index b46700ba660..80e86693057 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1635,6 +1635,11 @@ 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
+	 unisted.h on some POSIX hosts, but not all (Bug#10155).  */
+      extern char **environ;
+#endif
       int i;
       for (i = 0; environ[i]; i++)
         {