diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-09 10:19:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-09 10:19:35 +0100 |
| commit | d483a0007d3a25fbf565436f655fa45b4265628a (patch) | |
| tree | 375342c609f272e0e025d33d4891fba3fdb69a7b /pixman | |
| parent | b4e09d9f9c2cb930daef6b578e3051e71425ed7f (diff) | |
| download | vcxsrv-d483a0007d3a25fbf565436f655fa45b4265628a.tar.gz vcxsrv-d483a0007d3a25fbf565436f655fa45b4265628a.tar.bz2 vcxsrv-d483a0007d3a25fbf565436f655fa45b4265628a.zip | |
libxcb fontconfig pixman mesa git update 9 Mar 2012
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 2 | ||||
| -rw-r--r-- | pixman/pixman/pixman-mmx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 5eeb6a54e..17e30f5e4 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -54,7 +54,7 @@ AC_PREREQ([2.57]) m4_define([pixman_major], 0) m4_define([pixman_minor], 25) -m4_define([pixman_micro], 1) +m4_define([pixman_micro], 3) 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 fe31b0865..f9efd73d3 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -336,7 +336,7 @@ static __inline__ __m64 ldq_u(uint64_t *p) #endif } -static __inline__ uint32_t ldl_u(uint32_t *p) +static __inline__ uint32_t ldl_u(const uint32_t *p) { #ifdef USE_X86_MMX /* x86's alignment restrictions are very relaxed. */ |