From ebea78cdba0ff14a397239ee1936bd254c181e1b Mon Sep 17 00:00:00 2001 From: Tomas Carnecky Date: Thu, 28 Aug 2008 18:05:40 -0400 Subject: Prepare for array-index based devPrivates. TODO: static indices can be made just an int; some indices can be combined. --- mi/mipointer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mi/mipointer.c') diff --git a/mi/mipointer.c b/mi/mipointer.c index 809ce5e8b..8293e9b4f 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -41,13 +41,15 @@ in this Software without prior written authorization from The Open Group. # include "dixstruct.h" # include "inputstr.h" -_X_EXPORT DevPrivateKey miPointerScreenKey = &miPointerScreenKey; +static int miPointerScreenKeyIndex; +_X_EXPORT DevPrivateKey miPointerScreenKey = &miPointerScreenKeyIndex; #define GetScreenPrivate(s) ((miPointerScreenPtr) \ dixLookupPrivate(&(s)->devPrivates, miPointerScreenKey)) #define SetupScreen(s) miPointerScreenPtr pScreenPriv = GetScreenPrivate(s) -static DevPrivateKey miPointerPrivKey = &miPointerPrivKey; +static int miPointerPrivKeyIndex; +static DevPrivateKey miPointerPrivKey = &miPointerPrivKeyIndex; #define MIPOINTER(dev) \ ((DevHasCursor((dev)) || (!dev->isMaster && !dev->u.master)) ? \ -- cgit v1.2.3