svn merge ^/branches/released .

1 files changed, 7 insertions, 8 deletions

diff --git a/xorg-server/hw/xnest/GC.c b/xorg-server/hw/xnest/GC.c
index 9df015728..3c0074cc9 100644
--- a/xorg-server/hw/xnest/GC.c
+++ b/xorg-server/hw/xnest/GC.c
@@ -35,8 +35,7 @@ is" without express or implied warranty.
 #include "XNFont.h"

 #include "Color.h"

 

-static int xnestGCPrivateKeyIndex;

-DevPrivateKey xnestGCPrivateKey = &xnestGCPrivateKeyIndex;

+DevPrivateKeyRec xnestGCPrivateKeyRec;

 

 static GCFuncs xnestFuncs = {

   xnestValidateGC,

@@ -210,10 +209,10 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
       break;

       

     case CT_REGION:

-      nRects = REGION_NUM_RECTS((RegionPtr)pValue);

+      nRects = RegionNumRects((RegionPtr)pValue);

       size = nRects * sizeof(*pRects);

       pRects = (XRectangle *) malloc(size);

-      pBox = REGION_RECTS((RegionPtr)pValue);

+      pBox = RegionRects((RegionPtr)pValue);

       for (i = nRects; i-- > 0; ) {

 	pRects[i].x = pBox[i].x1;

 	pRects[i].y = pBox[i].y1;

@@ -277,7 +276,7 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
        * other parts of server can only deal with CT_NONE,

        * CT_PIXMAP and CT_REGION client clips.

        */

-      pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects,

+      pGC->clientClip = (pointer) RegionFromRects(nRects,

 						  (xRectangle *)pValue, type);

       free(pValue);

       pValue = pGC->clientClip;

@@ -313,7 +312,7 @@ xnestDestroyClipHelper(GCPtr pGC)
       break;

       

     case CT_REGION:

-      REGION_DESTROY(pGC->pScreen, pGC->clientClip); 

+      RegionDestroy(pGC->clientClip);

       break;

     }

 }

@@ -331,8 +330,8 @@ xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc)
       break;

 

     case CT_REGION:

-      pRgn = REGION_CREATE(pGCDst->pScreen, NULL, 1);

-      REGION_COPY(pGCDst->pScreen, pRgn, pGCSrc->clientClip);

+      pRgn = RegionCreate(NULL, 1);

+      RegionCopy(pRgn, pGCSrc->clientClip);

       xnestChangeClip(pGCDst, CT_REGION, pRgn, 0);

       break;

     }