xserver: Branch 'master'

[Adam Jackson]

 dix/pixmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0e1959f285d7a7df66f42d55912a5a595decd0f
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Feb 29 16:45:11 2008 -0500

    On second thought, revert that, it'll make large pixmaps painfully slow.
    
    Need to just fix the callers.

diff --git a/dix/pixmap.c b/dix/pixmap.c
index d4b4195..82e388c 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -113,7 +113,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
     if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
 	return NullPixmap;
     
-    pPixmap = (PixmapPtr)xcalloc(1, pScreen->totalPixmapSize + pixDataSize);
+    pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
     if (!pPixmap)
 	return NullPixmap;