From: Karoly Lorentey Date: Sat, 19 Mar 2005 17:55:13 +0000 (+0000) Subject: Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191) X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~289 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=392711ede18168618ac6eedd4fdf5910d11a2714;p=emacs.git Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-184 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-185 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-186 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-187 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-188 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-189 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-190 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-191 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-39 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-40 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-41 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-42 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-43 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-44 Merge from emacs--cvs-trunk--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-311 --- 392711ede18168618ac6eedd4fdf5910d11a2714 diff --cc lib-src/emacsclient.c index fbe719772b9,90c0228f720..3cc4cbe5f32 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@@ -41,12 -41,8 +41,12 @@@ Boston, MA 02111-1307, USA. * # include #endif /* not VMS */ +#include +#include + + char *getenv (), *getwd (); - char *getcwd (); + char *(getcwd) (); #ifndef VERSION #define VERSION "unspecified"