Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 18:52:14 +0000 (19:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 18:58:02 +0000 (19:58 +0100)
* commit '91894f27dce531c13d7e1be20253877f2e1e9e66':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
configure

See: 9e208ce6dd94596b4185a93af4aab3dcd28eb5b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure

index 586c26b..1bf8f80 100755 (executable)
--- a/configure
+++ b/configure
@@ -3257,8 +3257,7 @@ msvc_flags(){
             -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                        -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                        -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
-                                       -wd4554 \
-                                       -wd4273 -wd4701 ;;
+                                       -wd4273 -wd4554 -wd4701 ;;
         esac
     done
 }