pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-edge.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

New commits:
diff-tree 0c80a0cd84f30616563cef5910df9deb4f8ed687 (from 0f392d81748ab1338d294de96e28c43270f24180)
Author: Alan Coopersmith <alanc at sun.com>
Date:   Mon Jul 16 15:06:23 2007 -0400

    Build fixes for Solaris.

diff --git a/pixman/pixman-edge.c b/pixman/pixman-edge.c
index 335a25f..191752f 100644
--- a/pixman/pixman-edge.c
+++ b/pixman/pixman-edge.c
@@ -321,13 +321,9 @@ pixman_rasterize_edges (pixman_image_t *
 			pixman_fixed_t	b)
 {
     if (image->common.read_func	|| image->common.write_func)
-    {
-	return pixman_rasterize_edges_accessors (image, l, r, t, b);
-    }
+	pixman_rasterize_edges_accessors (image, l, r, t, b);
     else
-    {
-	return pixman_rasterize_edges_no_accessors (image, l, r, t, b);
-    }
+	pixman_rasterize_edges_no_accessors (image, l, r, t, b);
 }
 
 #endif