summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Jones <jajones@nvidia.com>2010-06-18 17:28:15 -0700
committerKeith Packard <keithp@keithp.com>2010-07-01 22:59:09 -0400
commit48cac27870992f6bde2c48429ff03c0a7606d5c1 (patch)
tree77f483e273112a91c984fd1a5e51ca193f4b0891
parenta71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa (diff)
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@nvidia.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--include/privates.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/privates.h b/include/privates.h
index 4fed7d058..5ba935817 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);
}
/*