diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-08 11:31:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-08 11:31:50 +0100 |
| commit | ceca11a64938e803d2e0d8ccfc030357c3a0121c (patch) | |
| tree | cd5e20638fed3446ac99e4c3d29809ef07b28d18 /pixman | |
| parent | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (diff) | |
| parent | b4e09d9f9c2cb930daef6b578e3051e71425ed7f (diff) | |
| download | vcxsrv-ceca11a64938e803d2e0d8ccfc030357c3a0121c.tar.gz vcxsrv-ceca11a64938e803d2e0d8ccfc030357c3a0121c.tar.bz2 vcxsrv-ceca11a64938e803d2e0d8ccfc030357c3a0121c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/pixman/pixman-mmx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c index 4cf554934..6fae7f75d 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -57,6 +57,9 @@ _mm_empty (void) #endif #if defined __GNUC__ && defined USE_X86_MMX +# ifdef __SUNPRO_C +# include <xmmintrin.h> +# else /* We have to compile with -msse to use xmmintrin.h, but that causes SSE * instructions to be generated that we don't want. Just duplicate the * functions we want to use. */ @@ -82,6 +85,7 @@ _mm_shuffle_pi16 (__m64 __A, int8_t const __N) return ret; } +# endif #define _MM_SHUFFLE(fp3,fp2,fp1,fp0) \ (((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | (fp0)) |