Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'

* commit '91894f27dce531c13d7e1be20253877f2e1e9e66': configure: Disable shift operator precedence warnings with MSVC Conflicts: configure See: 9e208ce6dd Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 19:52:14 +01:00 · 2015-03-17 19:52:14 +01:00 · 33a79e443b
parent 13f8bbfb70 91894f27dc
commit 33a79e443b
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@ -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
 }