From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 12 Jul 2018 00:06:26 +0000 (-0700)
Subject: util/rb_tree: Fix a compiler warning
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=ccb8309516792fedd4ed50f8db81d84682b967c3;ds=sidebyside

util/rb_tree: Fix a compiler warning

Gcc 8 warns "cast to pointer from integer of different size" in 32-bit
builds.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
---

diff --git a/src/util/rb_tree.h b/src/util/rb_tree.h
index e8750b32d0e..c77e9255ea2 100644
--- a/src/util/rb_tree.h
+++ b/src/util/rb_tree.h
@@ -55,7 +55,7 @@ struct rb_node {
 static inline struct rb_node *
 rb_node_parent(struct rb_node *n)
 {
-    return (struct rb_node *)(n->parent & ~1ull);
+    return (struct rb_node *)(n->parent & ~(uintptr_t)1);
 }
 
 /** A red-black tree