svn merge -r588:HEAD ^/branches/released .

1 files changed, 17 insertions, 16 deletions

diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index 978fe5c17..c2c8a0687 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -99,7 +99,7 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
      * The client *could* allocate multiple, but while supported,

      * it is not expected to be common

      */

-    ccw = xalloc (sizeof (CompClientWindowRec));

+    ccw = malloc(sizeof (CompClientWindowRec));

     if (!ccw)

 	return BadAlloc;

     ccw->id = FakeClientID (pClient->index);

@@ -109,10 +109,10 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
      */

     if (!cw)

     {

-	cw = xcalloc (1,sizeof (CompWindowRec));

+	cw = calloc (1,sizeof (CompWindowRec));

 	if (!cw)

 	{

-	    xfree (ccw);

+	    free(ccw);

 	    return BadAlloc;

 	}

 	cw->damage = DamageCreate (compReportDamage,

@@ -123,8 +123,8 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
 				   pWin);

 	if (!cw->damage)

 	{

-	    xfree (ccw);

-	    xfree (cw);

+	    free(ccw);

+	    free(cw);

 	    return BadAlloc;

 	}

 	if (wasMapped)

@@ -207,7 +207,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
 	    *prev = ccw->next;

 	    if (ccw->update == CompositeRedirectManual)

 		cw->update = CompositeRedirectAutomatic;

-	    xfree (ccw);

+	    free(ccw);

 	    break;

 	}

     }

@@ -229,7 +229,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
 	REGION_UNINIT (pScreen, &cw->borderClip);

     

 	dixSetPrivate(&pWin->devPrivates, CompWindowPrivateKey, NULL);

-	xfree (cw);

+	free(cw);

     }

     else if (cw->update == CompositeRedirectAutomatic &&

 	     !cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone)

@@ -295,7 +295,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
      * The client *could* allocate multiple, but while supported,

      * it is not expected to be common

      */

-    ccw = xalloc (sizeof (CompClientWindowRec));

+    ccw = malloc(sizeof (CompClientWindowRec));

     if (!ccw)

 	return BadAlloc;

     ccw->id = FakeClientID (pClient->index);

@@ -305,10 +305,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
      */

     if (!csw)

     {

-	csw = xalloc (sizeof (CompSubwindowsRec));

+	csw = malloc(sizeof (CompSubwindowsRec));

 	if (!csw)

 	{

-	    xfree (ccw);

+	    free(ccw);

 	    return BadAlloc;

 	}

 	csw->update = CompositeRedirectAutomatic;

@@ -327,10 +327,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
 		(void) compUnredirectWindow (pClient, pChild, update);

 	    if (!csw->clients)

 	    {

-		xfree (csw);

+		free(csw);

 		dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, 0);

 	    }

-	    xfree (ccw);

+	    free(ccw);

 	    return ret;

 	}

     }

@@ -391,7 +391,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
 	    for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib)

 		(void) compUnredirectWindow (pClient, pChild, ccw->update);

 

-	    xfree (ccw);

+	    free(ccw);

 	    break;

 	}

     }

@@ -402,7 +402,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
     if (!csw->clients)

     {

 	dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, NULL);

-	xfree (csw);

+	free(csw);

     }

 }

 

@@ -497,10 +497,11 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
 	 */

 	if (pGC)

 	{

-	    XID val = IncludeInferiors;

+	    ChangeGCVal val;

+	    val.val = IncludeInferiors;

 	    

 	    ValidateGC(&pPixmap->drawable, pGC);

-	    dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);

+	    ChangeGC (serverClient, pGC, GCSubwindowMode, &val);

 	    (*pGC->ops->CopyArea) (&pParent->drawable,

 				   &pPixmap->drawable,

 				   pGC,