diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 7 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 1 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0832f8932ee..db1464f65d8 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2011-11-27 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS). + + * emacsclient.c (main) <environ>: Remove declaration, already + pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows. + 2011-11-24 Glenn Morris <rgm@gnu.org> * make-docfile.c (scan_lisp_file): Treat defcustom like defvar. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 56e17c100be..b46700ba660 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1635,7 +1635,6 @@ main (int argc, char **argv) /* Send over our environment and current directory. */ if (!current_frame) { - extern char **environ; int i; for (i = 0; environ[i]; i++) { diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 28f913a4df6..be7f4d0b6db 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -23,7 +23,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse emacsclient LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \ - -I../nt/inc -I../src + -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS) LIBS = $(BASE_LIBS) $(ADVAPI32) |