Skip to content

Commit dbfcea2

Browse files
author
Allan Sandfeld Jensen
committed
Fix building with clang_cl
Clang reports itself as MSVC but doesn't allow intrinsics to be used unconditionally independent of command-line flags like MSVC does. Fixes: QTBUG-68551 Change-Id: I65d1ee1aa5c02b7c3a25c10c69c3d5e88129b858 Reviewed-by: Eirik Aavitsland <[email protected]>
1 parent 434aa24 commit dbfcea2

File tree

1 file changed

+3
-3
lines changed
  • src/3rdparty/libwebp/src/dsp

1 file changed

+3
-3
lines changed

src/3rdparty/libwebp/src/dsp/dsp.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ extern "C" {
5555
#if !defined(EMSCRIPTEN)
5656

5757
#if defined(_MSC_VER) && _MSC_VER > 1310 && \
58-
(defined(_M_X64) || defined(_M_IX86))
58+
(defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__)
5959
#define WEBP_MSC_SSE2 // Visual C++ SSE2 targets
6060
#endif
6161

6262
#if defined(_MSC_VER) && _MSC_VER >= 1500 && \
63-
(defined(_M_X64) || defined(_M_IX86))
63+
(defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__)
6464
#define WEBP_MSC_SSE41 // Visual C++ SSE4.1 targets
6565
#endif
6666

@@ -90,7 +90,7 @@ extern "C" {
9090
#define WEBP_USE_NEON
9191
#endif
9292

93-
#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
93+
#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) && !defined(__clang__)
9494
#define WEBP_USE_NEON
9595
#define WEBP_USE_INTRINSICS
9696
#endif

0 commit comments

Comments
 (0)