svn merge ^/branches/released .

1 files changed, 8 insertions, 4 deletions

diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index 069a38bd8..4b9ce0fa5 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -40,15 +40,13 @@ in this Software without prior written authorization from The Open Group.
 # include   "dixstruct.h"

 # include   "inputstr.h"

 

-static int miPointerScreenKeyIndex;

-DevPrivateKey miPointerScreenKey = &miPointerScreenKeyIndex;

+DevPrivateKeyRec miPointerScreenKeyRec;

 

 #define GetScreenPrivate(s) ((miPointerScreenPtr) \

     dixLookupPrivate(&(s)->devPrivates, miPointerScreenKey))

 #define SetupScreen(s)	miPointerScreenPtr  pScreenPriv = GetScreenPrivate(s)

 

-static int miPointerPrivKeyIndex;

-static DevPrivateKey miPointerPrivKey = &miPointerPrivKeyIndex;

+DevPrivateKeyRec miPointerPrivKeyRec;

 

 #define MIPOINTER(dev) \

     ((!IsMaster(dev) && !dev->u.master) ? \

@@ -86,6 +84,12 @@ miPointerInitialize (ScreenPtr                  pScreen,
 {

     miPointerScreenPtr	pScreenPriv;

 

+    if (!dixRegisterPrivateKey(&miPointerScreenKeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

+

+    if (!dixRegisterPrivateKey(&miPointerPrivKeyRec, PRIVATE_DEVICE, 0))

+	return FALSE;

+

     pScreenPriv = malloc(sizeof (miPointerScreenRec));

     if (!pScreenPriv)

 	return FALSE;