xserver git update 11/6/2010

1 files changed, 7 insertions, 13 deletions

diff --git a/xorg-server/hw/xquartz/xpr/driWrap.c b/xorg-server/hw/xquartz/xpr/driWrap.c
index 2e23cbbf5..37cb8cf5a 100644
--- a/xorg-server/hw/xquartz/xpr/driWrap.c
+++ b/xorg-server/hw/xquartz/xpr/driWrap.c
@@ -55,11 +55,11 @@ typedef struct {
     DevUnion devPrivate;

 } DRISavedDrawableState;

 

-static int driGCKeyIndex;

-static DevPrivateKey driGCKey = &driGCKeyIndex;

+static DevPrivateKeyRec driGCKeyRec;

+#define driGCKey (&driGCKeyRec)

 

-static int driWrapScreenKeyIndex;

-static DevPrivateKey driWrapScreenKey = &driWrapScreenKeyIndex;

+static DevPrivateKeyRec driWrapScreenKeyRec;

+#define driWrapScreenKey (&driWrapScreenKeyRec)

 

 static GCOps driGCOps;

 

@@ -527,21 +527,15 @@ Bool
 DRIWrapInit(ScreenPtr pScreen) {

     DRIWrapScreenRec *pScreenPriv;

 

-    if(!dixRequestPrivate(driGCKey, sizeof(DRIGCRec)))

+    if(!dixRegisterPrivateKey(&driGCKeyRec, PRIVATE_GC, sizeof(DRIGCRec)))

 	return FALSE;

 

-    if(!dixRequestPrivate(driWrapScreenKey, sizeof(DRIWrapScreenRec)))

-	return FALSE;

-    

-    pScreenPriv = malloc(sizeof(*pScreenPriv));

-

-    if(NULL == pScreenPriv)

+    if(!dixRegisterPrivateKey(&driWrapScreenKeyRec, PRIVATE_SCREEN, sizeof(DRIWrapScreenRec)))

 	return FALSE;

 

+    pScreenPriv = dixGetPrivateAddr(&pScreen->devPrivates, &driWrapScreenKeyRec);

     pScreenPriv->CreateGC = pScreen->CreateGC;

     pScreen->CreateGC = DRICreateGC;

     

-    dixSetPrivate(&pScreen->devPrivates, driWrapScreenKey, pScreenPriv);

-        

     return TRUE;

 }