xserver: Branch 'glucose-2'

[Alan Hourihane]

 glucose/glucose.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2846c3868a71d079c98cf05a9bb750791981f1bf
Author: Alan Hourihane <alanh at localhost.(none)>
Date:   Wed Aug 20 10:46:46 2008 +0100

    use dixLookupPrivate

diff --git a/glucose/glucose.h b/glucose/glucose.h
index 2ba6072..c7ecbf3 100644
--- a/glucose/glucose.h
+++ b/glucose/glucose.h
@@ -49,10 +49,12 @@ typedef struct {
     DestroyPixmapProcPtr *DestroyPixmap;
     __GLXscreen *screen;
     destroyGLXscreenProcPtr destroyGLXscreen;
+    glitz_glucose_screen_info_t *screen_info;
 } GLucoseScreenPrivRec, *GLucoseScreenPrivPtr;
 
 extern int glucoseScreenPrivateIndex;
-#define GLucoseGetScreenPriv(s)	((GLucoseScreenPrivPtr)(s)->devPrivates[glucoseScreenPrivateIndex].ptr)
+#define GLucoseGetScreenPriv(s)	((GLucoseScreenPrivPtr) \
+	dixLookupPrivate(&(s)->devPrivates, glucoseGetScreenPrivateKey()))
 #define GLucoseScreenPriv(s)	GLucoseScreenPrivPtr    pGLucoseScr = GLucoseGetScreenPriv(s)
 
 #endif /* GLUCOSE_H */