quadtree: Suppress compiler warnings

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/quadtree.c b/quadtree.c
index b173c3e933334dc98b161156489f610a26b5c6a3..b734c845ce09f9ccabef7bc9fdaccc271bc17979 100644 (file)
--- a/quadtree.c
+++ b/quadtree.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "quadtree.h"
 
@@ -43,10 +44,8 @@ static void validate_subtree(const struct quadtree *node)
 
 static void validate_tree(const struct quadtree *node)
 {
-       const struct quadtree *parent = quadtree_find_parent(node);
-
        if (debug)
-               validate_subtree(parent);
+               validate_subtree(quadtree_find_parent(node));
 }
 
 /**

diff --git a/quadtree.h b/quadtree.h
index 2e4a76b90b3b51376e86d3937b654a971bedf545..4204116f39e78e8e611b9ac437eca582c3a77f56 100644 (file)
--- a/quadtree.h
+++ b/quadtree.h
@@ -42,12 +42,13 @@ int walk_tree(const struct quadtree_iterator *iterator);
 
 
 /* quadtree_find_parent - return the highest parent of the node */
-static inline struct quadtree *quadtree_find_parent(struct quadtree *node)
+static inline struct quadtree *quadtree_find_parent(const struct quadtree *node)
 {
-       while (node->parent)
-               node = node->parent;
+       struct quadtree *t = (struct quadtree *)node;
+       while (t->parent)
+               t = t->parent;
 
-       return node;
+       return t;
 }
 
 #endif