# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1280029014 -7200
# Node ID d22063077a0c6a2b8c7fb6e34d2c5d489601f3f3
# Parent  68ca98ae70fb43511c4b4ebad747ad4f8a587597
* 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).

diff -r 68ca98ae70fb -r d22063077a0c lib-src/ChangeLog
--- 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):
diff -r 68ca98ae70fb -r d22063077a0c lib-src/emacsclient.c
--- 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 *);