From 35a7804dae480ba540f77f4431d2327275357d0f Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 25 Jul 2010 05:36:54 +0200 Subject: [PATCH] * emacsclient.c (getcwd): Fix previous change. Make getcwd conditional on HAVE_GETCWD and declare with the correct POSIX profile (for some reason MinGW headers define its 2nd arg as int, not size_t; but getcwd is not used on Windows nonetheless). --- lib-src/ChangeLog | 7 +++++++ lib-src/emacsclient.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 09d139019e8..d0ab1087aa9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2010-07-25 Juanma Barranquero + + * emacsclient.c (getcwd): Fix previous change: make getcwd + conditional on HAVE_GETCWD and declare with the correct POSIX + profile (for some reason MinGW headers define its 2nd arg as int, + not size_t; but getcwd is not used on Windows nonetheless). + 2010-07-25 Juanma Barranquero * emacsclient.c (getcwd, w32_getenv): diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 39b5956741d..1ca9b793f3a 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -82,7 +82,9 @@ along with GNU Emacs. If not, see . */ char *getenv (const char *), *getwd (char *); -char *(getcwd) (char *, int); +#ifdef HAVE_GETCWD +char *(getcwd) (char *, size_t); +#endif #ifdef WINDOWSNT char *w32_getenv (char *); -- 2.39.2