* 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).

2 files changed, 10 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 09d139019e8..d0ab1087aa9 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,12 @@
 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):
         * ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes.
 
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 <http://www.gnu.org/licenses/>.  */
 
 
 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 *);