[cairo-commit] 2 commits - pixman/src

[Behdad Esfahbod]

 pixman/src/pixregion.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree bf2c0e44d8c8e1e692eafba7bccddd26f1f31c1b (from parents)
Merge: b8231f8949818099c4e6ed4e0669de6f8c8bf856 a8b736c1608c3d0b98b81f79ab1f5607cce245ed
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jun 16 00:13:18 2006 -0400

    Merge branch 'cairo' into cairo-origin

diff-tree a8b736c1608c3d0b98b81f79ab1f5607cce245ed (from 82496a6f7c5b0a9f91db6abc9e34202b8ffa77c4)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jun 16 00:08:44 2006 -0400

    Use enum time instead of int (shuts intel compiler up.)

diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
index b29adf4..aa756ab 100644
--- a/pixman/src/pixregion.c
+++ b/pixman/src/pixregion.c
@@ -1464,7 +1464,7 @@ pixman_region_validate(badreg, pOverlap)
     pixman_box16_t *	box;	    /* Current box in rects		    */
     pixman_box16_t *	riBox;      /* Last box in ri[j].reg		    */
     pixman_region16_t *  hreg;       /* ri[j_half].reg			    */
-    int		ret = PIXMAN_REGION_STATUS_SUCCESS;
+    pixman_region_status_t ret = PIXMAN_REGION_STATUS_SUCCESS;
 
     *pOverlap = PIXMAN_REGION_STATUS_FAILURE;
     if (!badreg->data)