xserver: Branch 'master'

[Keith Packard]

 include/privates.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48cac27870992f6bde2c48429ff03c0a7606d5c1
Author: James Jones <jajones at nvidia.com>
Date:   Fri Jun 18 17:28:15 2010 -0700

    Cast void* to pointer* to appease some compilers.
    
    When this privates.h is included in C++ builds, the compiler
    complains about implicitly casting void* to void**.  This small
    patch fixes that up.
    
    Signed-off-by: James Jones <jajones at nvidia.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/privates.h b/include/privates.h
index 4fed7d0..5ba9358 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -177,7 +177,7 @@ static inline pointer *
 dixLookupPrivateAddr(PrivatePtr *privates, const DevPrivateKey key)
 {
     assert (key->size == 0);
-    return dixGetPrivateAddr(privates, key);
+    return (pointer *)dixGetPrivateAddr(privates, key);
 }
 
 /*