From: Eli Zaretskii Date: Thu, 22 Nov 2012 03:56:38 +0000 (+0200) Subject: Fix MS-Windows build following 2012-11-21T21:06:52Z!eggert@cs.ucla.edu. X-Git-Tag: emacs-24.3.90~173^2~18^2~27 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec84768f9754d5943610cbbd048dc4d4a46d847f;p=emacs.git Fix MS-Windows build following 2012-11-21T21:06:52Z!eggert@cs.ucla.edu. src/w32.c (getcwd): Fix the 2nd argument type, to prevent conflicts with Windows system header. Fixes: debbugs:12945 --- diff --git a/src/ChangeLog b/src/ChangeLog index 9e9ae468044..3587a9e295b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-11-22 Eli Zaretskii + + * w32.c (getcwd): Fix the 2nd argument type, to prevent conflicts + with Windows system header. + 2012-11-21 Paul Eggert Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945). diff --git a/src/w32.c b/src/w32.c index da778eb8541..038a442f529 100644 --- a/src/w32.c +++ b/src/w32.c @@ -908,7 +908,7 @@ static char startup_dir[MAXPATHLEN]; /* Get the current working directory. */ char * -getcwd (char *dir, size_t dirsize) +getcwd (char *dir, int dirsize) { if (!dirsize) {