pixman: Branch 'master'

[GitLab Mirror]

 pixman/pixman-mmx.c |    6 +++++-
 pixman/pixman-x86.c |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 726d77f6fed577c08a1589e5478aef6d36cff69c
Author: Julia DeMille <me at jdemille.com>
Date:   Tue Sep 3 00:35:47 2024 +0000

    mmx: Fix compilation with clang-cl

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 110a98f..7ac962e 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -129,7 +129,11 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B)
  * If __m64 is a double datatype, then define USE_M64_DOUBLE.
  */
 #ifdef _MSC_VER
-# define M64_MEMBER m64_u64
+# ifdef __clang__
+#  define USE_CVT_INTRINSICS
+# else
+#  define M64_MEMBER m64_u64
+# endif
 #elif defined(__ICC)
 # define USE_CVT_INTRINSICS
 #elif defined(USE_LOONGSON_MMI)
diff --git a/pixman/pixman-x86.c b/pixman/pixman-x86.c
index 2f688eb..3216da9 100644
--- a/pixman/pixman-x86.c
+++ b/pixman/pixman-x86.c
@@ -76,6 +76,8 @@ detect_cpu_features (void)
 
 #if defined (__GNUC__)
 #include <cpuid.h>
+#elif defined(_MSC_VER)
+#include <intrin.h>
 #endif
 
 static void