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 /hw/xquartz/xpr | |
| 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 'hw/xquartz/xpr')
| -rw-r--r-- | hw/xquartz/xpr/dri.c | 9 | ||||
| -rw-r--r-- | hw/xquartz/xpr/xprCursor.c | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 3aacb192d..5b79419dd 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -71,9 +71,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <AvailabilityMacros.h> -static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey; -static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey; -static DevPrivateKey DRIPixmapPrivKey = &DRIPixmapPrivKey; +static int DRIScreenPrivKeyIndex; +static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex; +static int DRIWindowPrivKeyIndex; +static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKeyIndex; +static int DRIPixmapPrivKeyIndex; +static DevPrivateKey DRIPixmapPrivKey = &DRIPixmapPrivKeyIndex; static RESTYPE DRIDrawablePrivResType; diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index 76ab75c02..c1890a2e4 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -56,7 +56,8 @@ typedef struct { miPointerSpriteFuncPtr spriteFuncs; } QuartzCursorScreenRec, *QuartzCursorScreenPtr; -static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKey; +static int darwinCursorScreenKeyIndex; +static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKeyIndex; #define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \ dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey)) |