pixman: Branch 'master'

[GitLab Mirror]

 pixman/pixman-mmx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47d3fbe38fc88085e644b737f3eff92865ebd65a
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date:   Sun Jun 26 21:02:32 2022 -0400

    mmx: use xmmintrin.h if building with SSE2
    
    As of mingw-w64 commit 463f00975, winnt.h includes emmintrin.h when
    compiling with SSE2, causing redefinition errors for our copied MMX
    intrinsics.  If the build is assuming SSE2 anyway, just use the system
    header instead.

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index f7f5560..3a85616 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -60,7 +60,7 @@ _mm_empty (void)
 #endif
 
 #ifdef USE_X86_MMX
-# if (defined(__SUNPRO_C) || defined(_MSC_VER) || defined(_WIN64))
+# if (defined(__SSE2__) || defined(__SUNPRO_C) || defined(_MSC_VER) || defined(_WIN64))
 #  include <xmmintrin.h>
 # else
 /* We have to compile with -msse to use xmmintrin.h, but that causes SSE