From e7308292aaa7f16a5670a151b6112239691ea61f Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 30 Nov 2011 16:13:05 +0800 Subject: [PATCH] * emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155). --- lib-src/ChangeLog | 5 +++++ lib-src/emacsclient.c | 5 +++++ 2 files changed, 10 insertions(+) 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 + + * emacsclient.c (main): Condition last change on WINDOWSNT + (Bug#10155). + 2011-11-27 Eli Zaretskii * 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++) { -- 2.39.5