From 9976d2c099db028f24a09cef6f1686b3b5ab9975 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 8 Mar 2020 17:45:29 -0700 Subject: loongson: Avoid C90 mixing-code-and-decls warning --- pixman/loongson-mmintrin.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pixman/loongson-mmintrin.h b/pixman/loongson-mmintrin.h index 086c6e0..0e79e86 100644 --- a/pixman/loongson-mmintrin.h +++ b/pixman/loongson-mmintrin.h @@ -209,12 +209,13 @@ _mm_set_pi16 (uint16_t __w3, uint16_t __w2, uint16_t __w1, uint16_t __w0) : "f" (*(__m64 *)&val), "f" (*(__m64 *)&imm) ); return ret; + } else { + uint64_t val = ((uint64_t)__w3 << 48) + | ((uint64_t)__w2 << 32) + | ((uint64_t)__w1 << 16) + | ((uint64_t)__w0 << 0); + return *(__m64 *)&val; } - uint64_t val = ((uint64_t)__w3 << 48) - | ((uint64_t)__w2 << 32) - | ((uint64_t)__w1 << 16) - | ((uint64_t)__w0 << 0); - return *(__m64 *)&val; } extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) @@ -236,10 +237,11 @@ _mm_set_pi32 (unsigned __i1, unsigned __i0) : "f" (*(__m32 *)&__i1), "f" (*(__m64 *)&imm) ); return ret; + } else { + uint64_t val = ((uint64_t)__i1 << 32) + | ((uint64_t)__i0 << 0); + return *(__m64 *)&val; } - uint64_t val = ((uint64_t)__i1 << 32) - | ((uint64_t)__i0 << 0); - return *(__m64 *)&val; } #undef _MM_SHUFFLE -- cgit v1.2.1