diff options
| author | Tomas Carnecky <tom@dbservice.com> | 2008-08-28 18:05:40 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-08-28 18:05:40 -0400 |
| commit | ebea78cdba0ff14a397239ee1936bd254c181e1b (patch) | |
| tree | 3937720753cc112aaf9eb71ba0dcb39674362b98 /dbe | |
| parent | ec7907f8fa04dcff2649cc4846975844314f737e (diff) | |
Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices
can be combined.
Diffstat (limited to 'dbe')
| -rw-r--r-- | dbe/dbe.c | 6 | ||||
| -rw-r--r-- | dbe/midbe.c | 9 |
2 files changed, 10 insertions, 5 deletions
@@ -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 <stdio.h> -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; /****************************************************************************** |