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 /composite | |
| 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 'composite')
| -rw-r--r-- | composite/compext.c | 3 | ||||
| -rw-r--r-- | composite/compinit.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/composite/compext.c b/composite/compext.c index 154f71909..c1544021c 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -51,7 +51,8 @@ #define SERVER_COMPOSITE_MINOR 4 static CARD8 CompositeReqCode; -static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKey; +static int CompositeClientPrivateKeyIndex; +static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKeyIndex; RESTYPE CompositeClientWindowType; RESTYPE CompositeClientSubwindowsType; RESTYPE CompositeClientOverlayType; diff --git a/composite/compinit.c b/composite/compinit.c index 7914a8d25..495188e59 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -46,9 +46,12 @@ #include "compint.h" -DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKey; -DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKey; -DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKey; +static int CompScreenPrivateKeyIndex; +DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKeyIndex; +static int CompWindowPrivateKeyIndex; +DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKeyIndex; +static int CompSubwindowsPrivateKeyIndex; +DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKeyIndex; static Bool |