diff -rup patch-2.5.9-orig/common.h patch-2.5.9-mingw/common.h
--- patch-2.5.9-orig/common.h	Mon May 19 07:57:36 2003
+++ patch-2.5.9-mingw/common.h	Mon Nov 10 04:30:26 2003
@@ -68,9 +68,6 @@
 #ifndef S_IRUSR
 #define S_IRUSR (S_IROTH << 6)
 #endif
-#ifdef MKDIR_TAKES_ONE_ARG
-# define mkdir(name, mode) ((mkdir) (name))
-#endif
 
 #if HAVE_LIMITS_H
 # include <limits.h>
@@ -286,6 +283,10 @@ void *realloc ();
   XTERN int binary_transput;	/* O_BINARY if binary i/o is desired */
 #else
 # define binary_transput 0
+#endif
+
+#ifdef MKDIR_TAKES_ONE_ARG
+# define mkdir(name, mode) ((mkdir) (name))
 #endif
 
 #ifndef NULL_DEVICE
diff -rup patch-2.5.9-orig/m4/mkdir.m4 patch-2.5.9-mingw/m4/mkdir.m4
--- patch-2.5.9-orig/m4/mkdir.m4	Fri May 24 19:47:38 2002
+++ patch-2.5.9-mingw/m4/mkdir.m4	Mon Nov 10 04:32:00 2003
@@ -4,7 +4,8 @@ dnl From Mumit Khan and Paul Eggert
 dnl Determine whether mkdir accepts only one argument instead of the usual two.
 
 AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG],
-  [AC_CHECK_FUNCS(mkdir)
+  [AC_CHECK_HEADERS(unistd.h)
+   AC_CHECK_FUNCS(mkdir)
    AC_CACHE_CHECK([whether mkdir takes only one argument],
      patch_cv_mkdir_takes_one_arg,
      [patch_cv_mkdir_takes_one_arg=no
@@ -12,12 +13,18 @@ AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG
         AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/stat.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 	  ],
 	  [mkdir (".", 0);],
 	  ,
 	  [AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/stat.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 	     ],
 	     [mkdir (".");],
 	     patch_cv_mkdir_takes_one_arg=yes