xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 miext/rootless/accel/rlBlt.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b1c2d711e7f5bc29a66d4d692431991a82e5d2af
Author: Jeremy Huddleston <jeremy at Jeremy-Huddlestons-MacBook-Pro.local>
Date:   Fri Jan 16 12:58:01 2009 -0800

    Rootless: Fix a variable scope issue that causes crahses when sizeof(void *) != sizeof(CARD8)

diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c
index b5fe740..db18b56 100644
--- a/miext/rootless/accel/rlBlt.c
+++ b/miext/rootless/accel/rlBlt.c
@@ -131,9 +131,9 @@ rlBlt (FbBits   *srcLine,
 	{
 	    SCREENREC(pDstScreen)->imp->CopyBytes(
                             nmiddle * sizeof(*dst), height,
-                            (char *) srcLine + (srcX >> 3),
+                            (CARD8 *) srcLine + (srcX >> 3),
                             srcStride * sizeof (*src),
-                            (char *) dstLine + (dstX >> 3),
+                            (CARD8 *) dstLine + (dstX >> 3),
                             dstStride * sizeof (*dst));
 	    return;
 	}
@@ -150,16 +150,16 @@ rlBlt (FbBits   *srcLine,
 	{
 	    /* need to copy XRGB to ARGB. */
 
-	    void *src[2], *dest[2];
+	    void *source[2], *dest[2];
 	    unsigned int src_rowbytes[2], dest_rowbytes[2];
             unsigned int fn;
 
-	    src[0] = (char *) srcLine + (srcX >> 3);
-	    src[1] = NULL;
+	    source[0] = (CARD8 *) srcLine + (srcX >> 3);
+	    source[1] = NULL;
 	    src_rowbytes[0] = srcStride * sizeof(*src);
 	    src_rowbytes[1] = 0;
 
-	    dest[0] = (char *) dstLine + (dstX >> 3);
+	    dest[0] = (CARD8 *) dstLine + (dstX >> 3);
 	    dest[1] = dest[0];
 	    dest_rowbytes[0] = dstStride * sizeof(*dst);
 	    dest_rowbytes[1] = dest_rowbytes[0];
@@ -169,7 +169,7 @@ rlBlt (FbBits   *srcLine,
 
             if (SCREENREC(pDstScreen)->imp->CompositePixels(
                                 nmiddle, height,
-                                fn, src, src_rowbytes,
+                                fn, source, src_rowbytes,
                                 NULL, 0, dest, dest_rowbytes) == Success)
             {
                 return;