Module: Mesa Branch: master Commit: 8dba6f8cf4d1f1d2dfd102c7ddc230995488247c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8dba6f8cf4d1f1d2dfd102c7ddc230995488247c
Author: Tapani Pälli <tapani.pa...@intel.com> Date: Tue Jul 25 08:38:03 2017 +0300 util: fix warning/error on 32bit build Add uintptr_t cast to fix 'cast to pointer from integer of different size' warning on 32bit build (build error on Android M). Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Michel Dänzer <michel.daen...@amd.com> Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- src/util/hash_table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/hash_table.c b/src/util/hash_table.c index a9d442d680..1bda2149b9 100644 --- a/src/util/hash_table.c +++ b/src/util/hash_table.c @@ -588,7 +588,7 @@ _mesa_hash_table_u64_insert(struct hash_table_u64 *ht, uint64_t key, } if (sizeof(void *) == 8) { - _mesa_hash_table_insert(ht->table, (void *)key, data); + _mesa_hash_table_insert(ht->table, (void *)(uintptr_t)key, data); } else { struct hash_key_u64 *_key = CALLOC_STRUCT(hash_key_u64); @@ -604,7 +604,7 @@ static struct hash_entry * hash_table_u64_search(struct hash_table_u64 *ht, uint64_t key) { if (sizeof(void *) == 8) { - return _mesa_hash_table_search(ht->table, (void *)key); + return _mesa_hash_table_search(ht->table, (void *)(uintptr_t)key); } else { struct hash_key_u64 _key = { .value = key }; return _mesa_hash_table_search(ht->table, &_key); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit