Module: Mesa
Branch: master
Commit: 411d7429c942bc878675ea390c9a5f1eff86ddc6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=411d7429c942bc878675ea390c9a5f1eff86ddc6

Author: Erik Faye-Lund <erik.faye-l...@collabora.com>
Date:   Tue Mar 24 11:03:03 2020 +0100

rbug: clean up cast-warnings

Similarly to the previous cast; on 64-bit Windows, unsigned long is
32-bit, and casting a pointer to a non-matchin bit-width integer produce
warnings. So let's use uintpre_t for this purpose instead.

Reviewed-by: Brian Paul <bri...@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4297>

---

 src/gallium/auxiliary/driver_rbug/rbug_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/driver_rbug/rbug_core.c 
b/src/gallium/auxiliary/driver_rbug/rbug_core.c
index d8dda8af227..53cc941c2ca 100644
--- a/src/gallium/auxiliary/driver_rbug/rbug_core.c
+++ b/src/gallium/auxiliary/driver_rbug/rbug_core.c
@@ -44,8 +44,8 @@
 
 #include <errno.h>
 
-#define U642VOID(x) ((void *)(unsigned long)(x))
-#define VOID2U64(x) ((uint64_t)(unsigned long)(x))
+#define U642VOID(x) ((void *)(uintptr_t)(x))
+#define VOID2U64(x) ((uint64_t)(uintptr_t)(x))
 
 #define container_of(ptr, type, field) \
    (type*)((char*)ptr - offsetof(type, field))

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to