xserver: Branch 'master'

[Aaron Plattner]

 fb/fbimage.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 410e5b1d738ba47b36778e6cbed44023a27ce259 (from c2813514cf7b1a36caa848cbc2ceef99cf2eb769)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Sep 5 15:23:54 2006 -0700

    (unsigned long)(1 << 31) = bad news on x86_64.

diff --git a/fb/fbimage.c b/fb/fbimage.c
index bf5c06b..3b4a07c 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -68,7 +68,7 @@ fbPutImage (DrawablePtr	pDrawable,
 	break;
     case XYPixmap:
 	srcStride = BitmapBytePad(w + leftPad) / sizeof (FbStip);
-	for (i = 1 << (pDrawable->depth - 1); i; i >>= 1)
+	for (i = (unsigned long)1 << (pDrawable->depth - 1); i; i >>= 1)
 	{
 	    if (i & pGC->planemask)
 	    {