diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
| commit | af3f3672e5f77a06a24b1e648ee118f1420b45ae (patch) | |
| tree | 2f08e1da8d47d44fcbf78f660ee8d99bf162b5f2 /pixman | |
| parent | 60f8ca2d5842b40b8585c58095787c84edfa9803 (diff) | |
| parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
| download | vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.gz vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.bz2 vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 4 | ||||
| -rw-r--r-- | pixman/pixman/pixman-mmx.c | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index eb783ac7e..79cf21154 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -53,8 +53,8 @@ AC_PREREQ([2.57]) # m4_define([pixman_major], 0) -m4_define([pixman_minor], 23) -m4_define([pixman_micro], 9) +m4_define([pixman_minor], 25) +m4_define([pixman_micro], 1) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c index ea244f67e..42a7ba7cc 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -313,28 +313,24 @@ in_over (__m64 src, __m64 srca, __m64 mask, __m64 dest) /* Elemental unaligned loads */ -#ifdef _MSC_VER -#define ldq_u(p) *((__m64*)(p)) -#else static __inline__ __m64 ldq_u(uint64_t *p) { #ifdef USE_X86_MMX /* x86's alignment restrictions are very relaxed. */ - return (__m64)*p; + return *(__m64 *)p; #elif defined USE_ARM_IWMMXT int align = (uintptr_t)p & 7; __m64 *aligned_p; if (align == 0) - return (__m64)*p; + return *p; aligned_p = (__m64 *)((uintptr_t)p & ~7); - return _mm_align_si64 (aligned_p[0], aligned_p[1], align); + return (__m64) _mm_align_si64 (aligned_p[0], aligned_p[1], align); #else struct __una_u64 { uint64_t x __attribute__((packed)); }; const struct __una_u64 *ptr = (const struct __una_u64 *) p; - return (__m64)ptr->x; + return (__m64) ptr->x; #endif } -#endif static __inline__ uint32_t ldl_u(uint32_t *p) { |