diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:01:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:01:09 +0200 |
| commit | 2cbb70c71be52051a3367a185dcaa695217664e7 (patch) | |
| tree | 492450cd37a71f1775f3283bb22f5bc6f6aa8244 | |
| parent | adc70a5244a8a7c3d554cbcfc3f38f8396974900 (diff) | |
| parent | 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: If594ae6ab8040f90e5ebe754854b412073b734ec
| -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 fafc2d0..0d7f3fb 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(_M_X64) || defined(_M_IX86)) && !defined(__clang__) #define WEBP_MSC_SSE2 // Visual C++ SSE2 targets #endif #if defined(_MSC_VER) && _MSC_VER >= 1500 && \ - (defined(_M_X64) || defined(_M_IX86)) + (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) #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) +#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) && !defined(__clang__) #define WEBP_USE_NEON #define WEBP_USE_INTRINSICS #endif |