diff -rup patch-2.5.9/common.h patch-2.5.9-mingw/common.h
--- patch-2.5.9/common.h	Mon May 19 06:57:36 2003
+++ patch-2.5.9-mingw/common.h	Sat Oct 18 04:11:42 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/m4/mkdir.m4 patch-2.5.9-mingw/m4/mkdir.m4
--- patch-2.5.9/m4/mkdir.m4	Fri May 24 18:47:38 2002
+++ patch-2.5.9-mingw/m4/mkdir.m4	Sat Oct 18 04:13:52 2003
@@ -9,20 +9,13 @@ AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG
      patch_cv_mkdir_takes_one_arg,
      [patch_cv_mkdir_takes_one_arg=no
       if test $ac_cv_func_mkdir = yes; then
-        AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/stat.h>
+	AC_TRY_COMPILE([
+#include <dir.h>
 	  ],
-	  [mkdir (".", 0);],
-	  ,
-	  [AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/stat.h>
-	     ],
-	     [mkdir (".");],
-	     patch_cv_mkdir_takes_one_arg=yes
-	  )]
-	)
+	  [mkdir (".");],
+	  patch_cv_mkdir_takes_one_arg=yes,
+	  patch_cv_mkdir_takes_one_arg=no
+	  )
       fi
      ]
    )