mkdir: Make it work on mingw64.

(cherry picked from commit b969309b853c939f04cbae890abad73a8a595067)

diff --git a/ChangeLog b/ChangeLog
index fc03602..667d7b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Bruno Haible  <bruno@clisp.org>
+
+       mkdir: Make it work on mingw64.
+       * lib/sys_stat.in.h: Include <direct.h> together with <io.h>.
+       Reported by Roman Donchenko (Роман Донченко) <dxdragon@yandex.ru>.
+
 2010-04-10  Jim Meyering  <meyering@redhat.com>
 
        maint.mk: correct a diagnostic

diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 82792e4..3496a19 100644 (file)
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -56,7 +56,8 @@
 /* Before doing "#define mkdir rpl_mkdir" below, we need to include all
    headers that may declare mkdir().  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# include <io.h>
+# include <io.h>     /* mingw32, mingw64 */
+# include <direct.h> /* mingw64 */
 #endif
 
 #ifndef S_IFMT
@@ -455,7 +456,8 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
 #else
 /* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
    Additionally, it declares _mkdir (and depending on compile flags, an
-   alias mkdir), only in the nonstandard <io.h>, which is included above.  */
+   alias mkdir), only in the nonstandard includes <direct.h> and <io.h>,
+   which are included above.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
 static inline int