--- mingw32.h~	Sun Dec 05 15:15:28 1999
+++ mingw32.h	Sun Dec 05 18:57:25 1999
@@ -20,6 +20,14 @@
 
 /* based on cygwin32.h by Andy Piper <andy@xemacs.org> */
 
+#ifndef NOT_C_CODE
+#ifdef HAVE_CYGWIN_VERSION_H
+#include <cygwin/version.h>
+#else
+#error "You need a more recent version of mingw32"
+#endif
+#endif
+
 #ifndef WINDOWSNT
 #define WINDOWSNT
 #endif
@@ -28,8 +36,6 @@
 #define DOS_NT 	/* MSDOS or WINDOWSNT */
 #endif
 
-#define PBS_SMOOTH              0x01
-
 #ifdef HAVE_MS_WINDOWS
 #define HAVE_NTGUI
 #define HAVE_FACES
@@ -48,11 +54,15 @@
 #define HEAP_IN_DATA
 #define UNEXEC "unexcw.o"
 
+#define PBS_SMOOTH              0x01
+#define NSIG 23
+
+#if CYGWIN_VERSION_DLL_MAJOR < 21
 #define TIME_ONESHOT 0
 #define TIME_PERIODIC 1
 #define LOCALE_USE_CP_ACP 0x40000000
 #define SHGFI_EXETYPE 0x2000
-#define NSIG 23
+#endif
 
 #ifndef SPI_GETWHEELSCROLLLINES
 #define SPI_GETWHEELSCROLLLINES 104
@@ -181,15 +191,14 @@
 #define mkdir __mkdir
 #include <dir.h>
 #undef mkdir
-#ifdef HAVE_CYGWIN_VERSION_H
-#include <cygwin/version.h>
-#endif
 
+#if CYGWIN_VERSION_DLL_MAJOR < 21
 typedef unsigned int MMRESULT;
 typedef struct timecaps_tag {		
   unsigned int    wPeriodMin;
   unsigned int    wPeriodMax;
 } TIMECAPS;
+#endif
 
 /* IO calls that are emulated or shadowed */
 #define pipe    sys_pipe
@@ -215,10 +224,10 @@
 #define popen     _popen
 #define pclose    _pclose
 
-typedef int uid_t;
-typedef int gid_t;
-typedef int pid_t;
-typedef int ssize_t;
+/* typedef int uid_t;
+   typedef int gid_t;
+   typedef int pid_t;
+   typedef int ssize_t; */
 
 /* Encapsulation of system calls */
 #ifndef DONT_ENCAPSULATE