diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
| commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
| tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /Xext/hashtable.h | |
| parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff) | |
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'Xext/hashtable.h')
| -rw-r--r-- | Xext/hashtable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Xext/hashtable.h b/Xext/hashtable.h index 8a6573205..a988af32c 100644 --- a/Xext/hashtable.h +++ b/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,7 +75,7 @@ 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, const void *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. @@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, const void *key); use HtMember instead to determine if a key has been inserted. */ -extern _X_EXPORT pointer ht_find(HashTable ht, const void *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, |