[Emacs-diffs] /srv/bzr/emacs/trunk r110976: Fix MS-Windows build following revision 110972.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110976
fixes bug: http://debbugs.gnu.org/12945
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-22 05:56:38 +0200
message:
  Fix MS-Windows build following revision 110972.
  
   src/w32.c (getcwd): Fix the 2nd argument type, to prevent conflicts
   with Windows system header.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-21 21:06:52 +0000
+++ b/src/ChangeLog     2012-11-22 03:56:38 +0000
@@ -1,3 +1,8 @@
+2012-11-22  Eli Zaretskii  <address@hidden>
+
+       * w32.c (getcwd): Fix the 2nd argument type, to prevent conflicts
+       with Windows system header.
+
 2012-11-21  Paul Eggert  <address@hidden>
 
        Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945).

=== modified file 'src/w32.c'
--- a/src/w32.c 2012-11-21 21:06:52 +0000
+++ b/src/w32.c 2012-11-22 03:56:38 +0000
@@ -908,7 +908,7 @@
 
 /* Get the current working directory.  */
 char *
-getcwd (char *dir, size_t dirsize)
+getcwd (char *dir, int dirsize)
 {
   if (!dirsize)
     {