Index: aclocal.m4
==================================================================
--- aclocal.m4
+++ aclocal.m4
@@ -120,15 +120,15 @@
 			SHOBJEXT="dylib"
 			;;
 		hpux*)
 			SHOBJEXT="sl"
 			;;
-		mingw32msvc*)
+		mingw32|mingw32msvc*)
 			SHOBJEXT="dll"
 			SHOBJFLAGS="-DPIC"
-			CFLAGS="$CFLAGS -mno-cygwin -mms-bitfields"
-			CPPFLAGS="$CPPFLAGS -mno-cygwin -mms-bitfields"
+			CFLAGS="$CFLAGS -mms-bitfields"
+			CPPFLAGS="$CPPFLAGS -mms-bitfields"
 			SHOBJLDFLAGS='-shared -Wl,--dll -Wl,--enable-auto-image-base -Wl,--output-def,$[@].def,--out-implib,$[@].a'
 			;;
 		cygwin*)
 			SHOBJEXT="dll"
 			SHOBJFLAGS="-fPIC -DPIC"