From 8dba6f8cf4d1f1d2dfd102c7ddc230995488247c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 25 Jul 2017 08:38:03 +0300 Subject: [PATCH] util: fix warning/error on 32bit build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer Reviewed-by: Samuel Pitoiset --- 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 a9d442d6808..1bda2149b95 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); -- 2.30.2