Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'

[ffmpeg] / configure

diff --git a/configure b/configure
index f25f7dc7e509635b089dbac2a6943ae8d4a544c9..e29493aecd832413f6db6c56572443aca1c8a396 100755 (executable)
--- a/configure
+++ b/configure
@@ -4543,8 +4543,10 @@ elif enabled_any msvc icl; then
     enabled debug && add_ldflags -debug
     enable pragma_deprecated
     if enabled icl; then
-        # basically -fstrict-aliasing that does not work (correctly) on icl 13.x
-        check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
+        # -Qansi-alias is basically -fstrict-aliasing, but does not work
+        # (correctly) on icl 13.x.
+        check_cpp_condition "windows.h" "__ICL < 1300 || __ICL >= 1400" &&
+            add_cflags -Qansi-alias
         # icl will pass the inline asm tests but inline asm is currently
         # not supported (build will fail)
         disable inline_asm