pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 RELEASING               |    2 +-
 configure.ac            |    2 +-
 pixman/pixman-private.h |    9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit cf7bf4eb57351b44f467eda9f4d9fa8f97754550
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Jun 5 01:33:28 2009 -0400

    Post-release version bump

diff --git a/configure.ac b/configure.ac
index e79b804..768f6b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 15)
-m4_define([pixman_micro], 10)
+m4_define([pixman_micro], 11)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit b721bc49199a24364bceb6e76ad9c6e6b2996905
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Jun 5 01:10:00 2009 -0400

    Pre-release version bump
    
    Also squash some warnings and correct the variable name in RELEASING.

diff --git a/RELEASING b/RELEASING
index 5a97b28..e3e4214 100644
--- a/RELEASING
+++ b/RELEASING
@@ -19,7 +19,7 @@ Here are the steps to follow to create a new pixman release:
 
    and fix things until it passes. If your freedesktop username is
    different from your local username, then also set the variable
-   USERNAME on the commandline.
+   USER on the commandline.
 
    A very useful thing to do is to run the cairo test suite
    against pixman. This can be done by running the following
diff --git a/configure.ac b/configure.ac
index 5409e1d..e79b804 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 15)
-m4_define([pixman_micro], 9)
+m4_define([pixman_micro], 10)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 94e23c6..896dfac 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -560,8 +560,13 @@ _pixman_gradient_walker_pixel (GradientWalker       *walker,
 
 #define CLIP(a,b,c) ((a) < (b) ? (b) : ((a) > (c) ? (c) : (a)))
 
-#define MIN(a,b) ((a < b)? a : b)
-#define MAX(a,b) ((a > b)? a : b)
+#ifndef MIN
+#  define MIN(a,b) ((a < b)? a : b)
+#endif
+
+#ifndef MAX
+#  define MAX(a,b) ((a > b)? a : b)
+#endif
 
 #if 0
 /* FIXME: the MOD macro above is equivalent, but faster I think */