From 4c61bf84b11e26e6f22648668c95ea760a379163 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jun 2010 12:14:52 +0000 Subject: xserver git update 11/6/2010 --- xorg-server/hw/dmx/dmxgc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/hw/dmx/dmxgc.c') diff --git a/xorg-server/hw/dmx/dmxgc.c b/xorg-server/hw/dmx/dmxgc.c index 82f74b6e6..10e93c110 100644 --- a/xorg-server/hw/dmx/dmxgc.c +++ b/xorg-server/hw/dmx/dmxgc.c @@ -85,7 +85,7 @@ static GCOps dmxGCOps = { /** Initialize the GC on \a pScreen */ Bool dmxInitGC(ScreenPtr pScreen) { - if (!dixRequestPrivate(dmxGCPrivateKey, sizeof(dmxGCPrivRec))) + if (!dixRegisterPrivateKey(&dmxGCPrivateKeyRec, PRIVATE_GC, sizeof(dmxGCPrivRec))) return FALSE; return TRUE; } @@ -363,9 +363,9 @@ void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) case CT_REGION: if (dmxScreen->beDisplay) { - nRects = REGION_NUM_RECTS((RegionPtr)pGC->clientClip); + nRects = RegionNumRects((RegionPtr)pGC->clientClip); pRects = malloc(nRects * sizeof(*pRects)); - pBox = REGION_RECTS((RegionPtr)pGC->clientClip); + pBox = RegionRects((RegionPtr)pGC->clientClip); for (i = 0; i < nRects; i++) { pRects[i].x = pBox[i].x1; -- cgit v1.2.3