xserver: Branch 'master'

[Adam Jackson]

 render/picture.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 57b5b97a0710fc043b8a1c01d756cdb73dfe4567 (from f62beb6f3609e8b6e61325ac89017590811bbd07)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Sun Jul 29 11:02:47 2007 -0400

    ReduceCompositeOp returns a Render op, not a boolean.

diff --git a/render/picture.c b/render/picture.c
index d0ae326..5ddd68c 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1641,7 +1641,7 @@ FreePictFormat (pointer	pPictFormat,
  * unnecessary.  It may also avoid destination reads sometimes if apps aren't
  * being careful to avoid these cases.
  */
-static Bool
+static CARD8
 ReduceCompositeOp (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst)
 {
     Bool no_src_alpha, no_dst_alpha;