From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/Xext/hashtable.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xorg-server/Xext/hashtable.h') diff --git a/xorg-server/Xext/hashtable.h b/xorg-server/Xext/hashtable.h index 5d1598425..a988af32c 100644 --- a/xorg-server/Xext/hashtable.h +++ b/xorg-server/Xext/hashtable.h @@ -55,7 +55,7 @@ extern _X_EXPORT HashTable ht_create(int keySize, int dataSize, HashFunc hash, HashCompareFunc compare, - pointer cdata); + void *cdata); /** @brief HtDestruct deinitializes the structure. It does not free the memory allocated to HashTableRec */ @@ -75,12 +75,12 @@ extern _X_EXPORT void ht_destroy(HashTable ht); to avoid returning NULL. Obviously the data pointed cannot be modified, as implied by dataSize being 0. */ -extern _X_EXPORT pointer ht_add(HashTable ht, pointer key); +extern _X_EXPORT void *ht_add(HashTable ht, const void *key); /** @brief Removes a key from the hash table along with its associated data, which will be free'd. */ -extern _X_EXPORT void ht_remove(HashTable ht, pointer key); +extern _X_EXPORT void ht_remove(HashTable ht, const void *key); /** @brief Finds the associated data of a key from the hash table. @@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, pointer key); use HtMember instead to determine if a key has been inserted. */ -extern _X_EXPORT pointer ht_find(HashTable ht, pointer key); +extern _X_EXPORT void *ht_find(HashTable ht, const void *key); /** @brief A generic hash function */ extern _X_EXPORT unsigned ht_generic_hash(void *cdata, -- cgit v1.2.3