diff --git a/configure b/configure
index 40c6a7d3c7f..3cb8bc5092d 100755
--- a/configure
+++ b/configure
@@ -8227,6 +8227,9 @@ fi
 
     LIBEXT="dll"
     DLLEXT=""
+        case $host_cpu in
+      *i[3456]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;;
+    esac
         enable_iphlpapi=${enable_iphlpapi:-no}
     enable_kernel32=${enable_kernel32:-no}
     enable_ntdll=${enable_ntdll:-no}
diff --git a/configure.ac b/configure.ac
index e35189ca171..cd6e61ad336 100644
--- a/configure.ac
+++ b/configure.ac
@@ -728,6 +728,10 @@ case $host_os in
     AC_CHECK_TOOL(DLLTOOL,dlltool,false)
     LIBEXT="dll"
     DLLEXT=""
+    dnl Disable stdcall fixups to catch prototype mismatches
+    case $host_cpu in
+      *i[[3456]]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;;
+    esac
     dnl Disable modules that can't be used on Windows
     enable_iphlpapi=${enable_iphlpapi:-no}
     enable_kernel32=${enable_kernel32:-no}