xserver: Branch 'master'

[Daniel Stone]

 miext/rootless/accel/rlAccel.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9dbb73033ae60e7ab85f1469a696e2a52f0cb0fe
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Sat Dec 29 00:02:16 2007 +0200

    Rootless: Fix lvalue error from devPrivates change
    
    Instead of trying to use an invalid expression as an lvalue, use the function
    call instead.

diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c
index a144124..f3cb215 100644
--- a/miext/rootless/accel/rlAccel.c
+++ b/miext/rootless/accel/rlAccel.c
@@ -51,6 +51,9 @@ static DevPrivateKey rlAccelScreenPrivateKey = &rlAccelScreenPrivateKey;
 #define RLACCELREC(pScreen) ((rlAccelScreenRec *) \
     dixLookupPrivate(&(pScreen)->devPrivates, rlAccelScreenPrivateKey))
 
+#define SETRLACCELREC(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, rlAccelScreenPrivateKey, v)
+
 /* This is mostly identical to fbGCOps. */
 static GCOps rlAccelOps = {
     rlFillSpans,
@@ -132,7 +135,7 @@ RootlessAccelInit(ScreenPtr pScreen)
 
     s = xalloc(sizeof(rlAccelScreenRec));
     if (!s) return FALSE;
-    RLACCELREC(pScreen) = s;
+    SETRLACCELREC(pScreen, s);
 
     // Wrap the screen functions we need
     s->CreateGC = pScreen->CreateGC;