diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:03:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:03:13 +0200 |
| commit | e7940d951e211837ed45b759fb97282e8d65e4c5 (patch) | |
| tree | 026ebb2119d78e81b25745d66c1549b60a1cd617 /src/3rdparty/libwebp/src/dsp/dsp.h | |
| parent | 3f5b3599b9856c4bd10a65842eb3c2e535027fe4 (diff) | |
| parent | 054cdbd564c4f1efb731a1084fa7e2e84c0b001d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/dsp.h')
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/dsp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h index 0d7f3fb..fafc2d0 100644 --- a/src/3rdparty/libwebp/src/dsp/dsp.h +++ b/src/3rdparty/libwebp/src/dsp/dsp.h @@ -55,12 +55,12 @@ extern "C" { #if !defined(EMSCRIPTEN) #if defined(_MSC_VER) && _MSC_VER > 1310 && \ - (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) + (defined(_M_X64) || defined(_M_IX86)) #define WEBP_MSC_SSE2 // Visual C++ SSE2 targets #endif #if defined(_MSC_VER) && _MSC_VER >= 1500 && \ - (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) + (defined(_M_X64) || defined(_M_IX86)) #define WEBP_MSC_SSE41 // Visual C++ SSE4.1 targets #endif @@ -90,7 +90,7 @@ extern "C" { #define WEBP_USE_NEON #endif -#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) && !defined(__clang__) +#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) #define WEBP_USE_NEON #define WEBP_USE_INTRINSICS #endif |