[Emacs-diffs] /srv/bzr/emacs/trunk r100892: * emacsclient.c (getcwd): Fix previous change.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100892
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-25 05:36:54 +0200
message:
  * 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).
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-07-25 00:20:51 +0000
+++ b/lib-src/ChangeLog 2010-07-25 03:36:54 +0000
@@ -1,5 +1,12 @@
 2010-07-25  Juanma Barranquero  <address@hidden>
 
+       * 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  <address@hidden>
+
        * emacsclient.c (getcwd, w32_getenv):
        * ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes.
 

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2010-07-25 00:20:51 +0000
+++ b/lib-src/emacsclient.c     2010-07-25 03:36:54 +0000
@@ -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 *);