diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index fc7198019f..48ccfcb1d9 100644
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -83,10 +83,9 @@
 #include <stdlib.h>
 #define	BSDTYPES
 #define	HAVE_UNISTD_H	0
-#elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
-#  if !defined(__MINGW32__)     /* GRG */
-#  define BSDTYPES
-#  endif
+/* GRG: added check for MINGW32 */
+#elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)) && !defined(__MINGW32__)
+#define BSDTYPES
 #elif defined(OS2_16) || defined(OS2_32)
 #define	BSDTYPES
 #elif defined(__acornriscos)