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. --- dbe/dbe.c | 6 ++++-- dbe/midbe.c | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'dbe') diff --git a/dbe/dbe.c b/dbe/dbe.c index d34708d38..1a08bdab9 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -62,8 +62,10 @@ static Bool (* DbeInitFunct[MAXSCREENS])(); /* pScreen, pDbeScreenPriv */ /* These are static globals copied to DBE's screen private for use by DDX */ -static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKey; -static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKey; +static int dbeScreenPrivKeyIndex; +static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKeyIndex; +static int dbeWindowPrivKeyIndex; +static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKeyIndex; /* These are static globals copied to DBE's screen private for use by DDX */ static RESTYPE dbeDrawableResType; diff --git a/dbe/midbe.c b/dbe/midbe.c index c02e591d0..f8a3acc87 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -60,11 +60,14 @@ #include -static DevPrivateKey miDbeWindowPrivPrivKey = &miDbeWindowPrivPrivKey; +static int miDbeWindowPrivPrivKeyIndex; +static DevPrivateKey miDbeWindowPrivPrivKey = &miDbeWindowPrivPrivKeyIndex; static RESTYPE dbeDrawableResType; static RESTYPE dbeWindowPrivResType; -static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKey; -static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKey; +static int dbeScreenPrivKeyIndex; +static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKeyIndex; +static int dbeWindowPrivKeyIndex; +static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKeyIndex; /****************************************************************************** -- cgit v1.2.3