--- src/s/ms-w32.h.orig	2003-06-18 03:18:56.000000000 +0900
+++ src/s/ms-w32.h	2003-10-16 21:50:26.281250000 +0900
@@ -355,7 +355,12 @@
 #define fcloseall _fcloseall
 #define fdopen	  _fdopen
 #define fgetchar  _fgetchar
+#ifdef __MINGW32__
+#include <_mingw.h>
+#endif
+#if !defined(__MINGW32__) || !(__MINGW32_MAJOR_VERSION >= 4 || __MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 2)
 #define fileno	  _fileno
+#endif
 #define flushall  _flushall
 #define fputchar  _fputchar
 #define fsync	  _commit

--- nt/gmake.defs.orig	2003-10-16 07:53:44.947875000 +0900
+++ nt/gmake.defs	2003-10-16 23:50:34.651375000 +0900
@@ -267,7 +267,7 @@
 endif
 
 ifdef NOCYGWIN
-NOCYGWIN = -mno-cygwin
+NOCYGWIN = -mno-cygwin -mthreads
 endif
 
 ifeq "$(ARCH)" "i386"