xserver: Branch 'master'

[Maarten Maathuis]

 hw/xfree86/dri/dri.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5b336585a4cdf11d20831a9536ad581e959ea7f1
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Oct 10 23:23:02 2008 +0200

    dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
    
    - This breaks on the 2nd server generation.
    - No other subsystem seems to NULL their key.
    - This should fix bug 17982.

diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index d2599a9..3713659 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -351,7 +351,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec));
     if (!pDRIPriv) {
 	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
-        DRIScreenPrivKey = NULL;
         return FALSE;
     }
 
@@ -744,7 +743,6 @@ DRICloseScreen(ScreenPtr pScreen)
 
 	xfree(pDRIPriv);
 	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
-	DRIScreenPrivKey = NULL;
     }
 }