From 386707c6d19b974ca2e3db7f5c61873813c6fe44 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Tue, 16 Apr 2019 12:51:06 -0400
Subject: [PATCH] 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>
---
 arm/filter_neon_intrinsics.c  | 2 +-
 arm/palette_neon_intrinsics.c | 2 +-
 pngrtran.c                    | 2 +-
 3 files changed, 3 insertions(+), 3 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>
diff --git a/pngrtran.c b/pngrtran.c
index 9a8fad9f4..238f5afe7 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -21,7 +21,7 @@
 #ifdef PNG_ARM_NEON_IMPLEMENTATION
 #  if PNG_ARM_NEON_IMPLEMENTATION == 1
 #    define PNG_ARM_NEON_INTRINSICS_AVAILABLE
-#    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>