xserver: Branch 'master'

[Maarten Maathuis]

 exa/exa.c        |   18 +++++++++---------
 exa/exa_render.c |   16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 2db7b66863ae6055c3ce13c88b36d620de8a4d75
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Dec 19 23:12:37 2008 +0100

    exa: a few cleanups
    
    - Some warnings silenced.
    - Some whitespace cleanup.

diff --git a/exa/exa.c b/exa/exa.c
index 6dfde4c..7b732eb 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -72,7 +72,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
 {
     ExaScreenPriv (pPix->drawable.pScreen);
 
-    return ((unsigned long)ExaGetPixmapAddress(pPix) -
+    return ((unsigned long)(unsigned long *)ExaGetPixmapAddress(pPix) -
 	    (unsigned long)pExaScr->info->memoryBase);
 }
 
@@ -129,7 +129,7 @@ exaGetDrawablePixmap(DrawablePtr pDrawable)
 	return pDrawable->pScreen->GetWindowPixmap ((WindowPtr) pDrawable);
      else
 	return (PixmapPtr) pDrawable;
-}	
+}
 
 /**
  * Sets the offsets to add to coordinates to make them address the same bits in
@@ -166,7 +166,7 @@ exaPixmapDirty (PixmapPtr pPix, int x1, int y1, int x2, int y2)
 
     if (!pExaPixmap || !pExaPixmap->pDamage)
 	return;
-	
+
     box.x1 = max(x1, 0);
     box.y1 = max(y1, 0);
     box.x2 = min(x2, pPix->drawable.width);
@@ -368,7 +368,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
 	/* This is used by exa to optimize migration. */
 	DamageSetReportAfterOp (pExaPixmap->pDamage, TRUE);
     }
- 
+
     pExaPixmap->area = NULL;
 
     /* None of the pixmap bits are valid initially */
@@ -691,11 +691,11 @@ exaChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
 static RegionPtr
 exaBitmapToRegion(PixmapPtr pPix)
 {
-  RegionPtr ret;
-  exaPrepareAccess(&pPix->drawable, EXA_PREPARE_SRC);
-  ret = fbPixmapToRegion(pPix);
-  exaFinishAccess(&pPix->drawable, EXA_PREPARE_SRC);
-  return ret;
+    RegionPtr ret;
+    exaPrepareAccess(&pPix->drawable, EXA_PREPARE_SRC);
+    ret = fbPixmapToRegion(pPix);
+    exaFinishAccess(&pPix->drawable, EXA_PREPARE_SRC);
+    return ret;
 }
 
 static Bool
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 45cfff7..63ea5c1 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -1054,15 +1054,15 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     BoxRec		bounds;
 
     if (maskFormat) {
+	PicturePtr	pPicture;
+	INT16		xDst, yDst;
+	INT16		xRel, yRel;
+
 	miTrapezoidBounds (ntrap, traps, &bounds);
 
 	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
 	    return;
 
-	PicturePtr	pPicture;
-	INT16		xDst, yDst;
-	INT16		xRel, yRel;
-
 	xDst = traps[0].left.p1.x >> 16;
 	yDst = traps[0].left.p1.y >> 16;
 
@@ -1118,15 +1118,15 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     BoxRec		bounds;
 
     if (maskFormat) {
+	PicturePtr	pPicture;
+	INT16		xDst, yDst;
+	INT16		xRel, yRel;
+
 	miTriangleBounds (ntri, tris, &bounds);
 
 	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
 	    return;
 
-	PicturePtr	pPicture;
-	INT16		xDst, yDst;
-	INT16		xRel, yRel;
-
 	xDst = tris[0].p1.x >> 16;
 	yDst = tris[0].p1.y >> 16;