diff options
| author | Ryan VanderMeulen <rvandermeulen@mozilla.com> | 2019-04-16 12:51:06 -0400 |
|---|---|---|
| committer | Cosmin Truta <ctruta@gmail.com> | 2019-04-24 23:57:14 -0400 |
| commit | 386707c6d19b974ca2e3db7f5c61873813c6fe44 (patch) | |
| tree | 3ca0f4f7fe439287e4526708c610ea1365010d87 /arm | |
| parent | 216387f6f7ee043df24a84ab2dc53d2827148b5e (diff) | |
| download | libpng-386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz | |
arm: Use <arm_neon.h> when compiling aarch64 intrinsics with clang-cl
MSVC's <arm64_neon.h> header contains cl.exe intrinsics that are not
recognized by clang-cl.
Contributed-by: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Contributed-by: Mike Klein <mtklein@google.com>
Signed-off-by: Cosmin Truta <ctruta@gmail.com>
Diffstat (limited to 'arm')
| -rw-r--r-- | arm/filter_neon_intrinsics.c | 2 | ||||
| -rw-r--r-- | arm/palette_neon_intrinsics.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index 553c0be21..4466d48b2 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -18,7 +18,7 @@ /* This code requires -mfpu=neon on the command line: */ #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ -#if defined(_MSC_VER) && defined(_M_ARM64) +#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64) # include <arm64_neon.h> #else # include <arm_neon.h> diff --git a/arm/palette_neon_intrinsics.c b/arm/palette_neon_intrinsics.c index 00ddcefc9..49909d475 100644 --- a/arm/palette_neon_intrinsics.c +++ b/arm/palette_neon_intrinsics.c @@ -14,7 +14,7 @@ #if PNG_ARM_NEON_IMPLEMENTATION == 1 -#if defined(_MSC_VER) && defined(_M_ARM64) +#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64) # include <arm64_neon.h> #else # include <arm_neon.h> |