pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 configure.ac        |    2 +-
 pixman/pixman-mmx.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a6ad5120f7bd4add3b2e9c03c9fd769d5bbfd191
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Thu Mar 8 10:11:20 2012 -0500

    Post-release version bump to 0.25.3

diff --git a/configure.ac b/configure.ac
index 5ca062a..17e30f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 25)
-m4_define([pixman_micro], 2)
+m4_define([pixman_micro], 3)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit f73f7985318bf0e7446941d9bea9a94b35580342
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Thu Mar 8 09:33:16 2012 -0500

    Pre-release version bump to 0.25.2

diff --git a/configure.ac b/configure.ac
index 5eeb6a5..5ca062a 100644
--- a/configure.ac
+++ b/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], 2)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit 62df04eb257d16fbb4449855a48f6fdaf567e201
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Thu Mar 8 09:29:46 2012 -0500

    mmx: Squash a warning by making the argument to ldl_u() const

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index fe31b08..f9efd73 100644
--- a/pixman/pixman-mmx.c
+++ b/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. */