Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 37897)
+++ trunk/src/search.c	(revision 37898)
@@ -1932,11 +1932,11 @@
 	return pcb_lines_intersect_at(ax1, ay1, ax2, ay2, bx1, by1, bx2, by2, NULL, NULL);
 }
 
-rnd_r_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_box_t *query_box, rnd_r_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure)
+rnd_rtree_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_box_t *query_box, rnd_rtree_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure)
 {
 	pcb_layer_t *ly;
 	rnd_layer_id_t lid;
-	rnd_r_dir_t res;
+	rnd_rtree_dir_t res;
 	const rnd_rtree_box_t *query = (const rnd_rtree_box_t *)query_box;
 	rnd_rtree_dir_t (*cb)(void *, void *, const rnd_rtree_box_t *) = (rnd_rtree_dir_t(*)(void *, void *, const rnd_rtree_box_t *))cb_;
 
Index: trunk/src/search_r.h
===================================================================
--- trunk/src/search_r.h	(revision 37897)
+++ trunk/src/search_r.h	(revision 37898)
@@ -32,6 +32,6 @@
 #include <librnd/poly/rtree.h>
 
 /* Search data for given object types within a box using the usual rtree conventions for the callback */
-rnd_r_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_box_t *query_box, rnd_r_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure);
+rnd_rtree_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_box_t *query_box, rnd_rtree_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure);
 
 #endif
Index: trunk/src_plugins/dialogs/dlg_pinout.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pinout.c	(revision 37897)
+++ trunk/src_plugins/dialogs/dlg_pinout.c	(revision 37898)
@@ -81,7 +81,7 @@
 	}
 }
 
-static rnd_r_dir_t pinout_mouse_search_cb(void *closure, pcb_any_obj_t *obj, void *box)
+static rnd_rtree_dir_t pinout_mouse_search_cb(void *closure, pcb_any_obj_t *obj, void *box)
 {
 	pinout_ctx_t *ctx = closure;
 	rnd_hid_attr_val_t val;