mesa xkeyboard-config xserver git update 15 jan 2014

xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43

1 files changed, 7 insertions, 7 deletions

diff --git a/xorg-server/Xext/hashtable.c b/xorg-server/Xext/hashtable.c
index 9d9ef8949..471ecca1c 100644
--- a/xorg-server/Xext/hashtable.c
+++ b/xorg-server/Xext/hashtable.c
@@ -23,7 +23,7 @@ struct HashTableRec {
     HashFunc        hash;
     HashCompareFunc compare;
 
-    pointer         cdata;
+    void            *cdata;
 };
 
 typedef struct {
@@ -37,7 +37,7 @@ ht_create(int             keySize,
           int             dataSize,
           HashFunc        hash,
           HashCompareFunc compare,
-          pointer         cdata)
+          void            *cdata)
 {
     int c;
     int numBuckets;
@@ -117,8 +117,8 @@ double_size(HashTable ht)
     }
 }
 
-pointer
-ht_add(HashTable ht, pointer key)
+void *
+ht_add(HashTable ht, const void *key)
 {
     unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
     struct xorg_list *bucket = &ht->buckets[index];
@@ -164,7 +164,7 @@ ht_add(HashTable ht, pointer key)
 }
 
 void
-ht_remove(HashTable ht, pointer key)
+ht_remove(HashTable ht, const void *key)
 {
     unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
     struct xorg_list *bucket = &ht->buckets[index];
@@ -182,8 +182,8 @@ ht_remove(HashTable ht, pointer key)
     }
 }
 
-pointer
-ht_find(HashTable ht, pointer key)
+void *
+ht_find(HashTable ht, const void *key)
 {
     unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
     struct xorg_list *bucket = &ht->buckets[index];