Mercurial > emacs
changeset 109517:d22063077a0c
* 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).
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sun, 25 Jul 2010 05:36:54 +0200 |
| parents | 68ca98ae70fb |
| children | 2fe88640ebd3 |
| files | lib-src/ChangeLog lib-src/emacsclient.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Sun Jul 25 02:20:51 2010 +0200 +++ b/lib-src/ChangeLog Sun Jul 25 05:36:54 2010 +0200 @@ -1,3 +1,10 @@ +2010-07-25 Juanma Barranquero <lekktu@gmail.com> + + * 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 <lekktu@gmail.com> * emacsclient.c (getcwd, w32_getenv):
--- a/lib-src/emacsclient.c Sun Jul 25 02:20:51 2010 +0200 +++ b/lib-src/emacsclient.c Sun Jul 25 05:36:54 2010 +0200 @@ -82,7 +82,9 @@ 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 *);