[Emacs-diffs] /srv/bzr/emacs/trunk r106554: * emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155).

[Chong Yidong]

------------------------------------------------------------
revno: 106554
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-30 16:13:05 +0800
message:
  * emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155).
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-11-27 18:52:53 +0000
+++ b/lib-src/ChangeLog 2011-11-30 08:13:05 +0000
@@ -1,3 +1,8 @@
+2011-11-30  Chong Yidong  <address@hidden>
+
+       * emacsclient.c (main): Condition last change on WINDOWSNT
+       (Bug#10155).
+
 2011-11-27  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2011-11-27 18:52:53 +0000
+++ b/lib-src/emacsclient.c     2011-11-30 08:13:05 +0000
@@ -1635,6 +1635,11 @@
   /* 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++)
         {