Index: obj_line_drcenf.c
===================================================================
--- obj_line_drcenf.c	(revision 37892)
+++ obj_line_drcenf.c	(revision 37893)
@@ -195,34 +195,34 @@
 	jmp_buf env;
 };
 
-static rnd_r_dir_t drcPstk_callback(const rnd_box_t *b, void *cl)
+static rnd_rtree_dir_t drcPstk_callback(void *cl, void *obj, const rnd_rtree_box_t *box)
 {
-	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	pcb_pstk_t *ps = (pcb_pstk_t *)obj;
 	struct drc_info *i = (struct drc_info *)cl;
 
 	if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, ps) && pcb_isc_pstk_line(pcb_find0, ps, i->line, rnd_false))
 		longjmp(i->env, 1);
-	return RND_R_DIR_FOUND_CONTINUE;
+	return rnd_RTREE_DIR_FOUND_CONT;
 }
 
-static rnd_r_dir_t drcLine_callback(const rnd_box_t * b, void *cl)
+static rnd_rtree_dir_t drcLine_callback(void *cl, void *obj, const rnd_rtree_box_t *box)
 {
-	pcb_line_t *line = (pcb_line_t *) b;
+	pcb_line_t *line = (pcb_line_t *)obj;
 	struct drc_info *i = (struct drc_info *) cl;
 
 	if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_isc_line_line(pcb_find0, line, i->line))
 		longjmp(i->env, 1);
-	return RND_R_DIR_FOUND_CONTINUE;
+	return rnd_RTREE_DIR_FOUND_CONT;
 }
 
-static rnd_r_dir_t drcArc_callback(const rnd_box_t * b, void *cl)
+static rnd_rtree_dir_t drcArc_callback(void *cl, void *obj, const rnd_rtree_box_t *box)
 {
-	pcb_arc_t *arc = (pcb_arc_t *) b;
+	pcb_arc_t *arc = (pcb_arc_t *)obj;
 	struct drc_info *i = (struct drc_info *) cl;
 
 	if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_isc_line_arc(pcb_find0, i->line, arc))
 		longjmp(i->env, 1);
-	return RND_R_DIR_FOUND_CONTINUE;
+	return rnd_RTREE_DIR_FOUND_CONT;
 }
 
 double pcb_drc_lines(pcb_board_t *pcb, const rnd_point_t *start, rnd_point_t *end, rnd_point_t *mid_out, rnd_bool way, rnd_bool optimize, rnd_coord_t tot_thick)
@@ -333,20 +333,20 @@
 			last2 = length2;
 			if (setjmp(info.env) == 0) {
 				info.line = &line1;
-				rnd_r_search(PCB->Data->padstack_tree, &line1.BoundingBox, NULL, drcPstk_callback, &info, NULL);
+				rnd_rtree_search_any(PCB->Data->padstack_tree, (rnd_rtree_box_t*)&line1.BoundingBox, NULL, drcPstk_callback, &info, NULL);
 				if (two_lines) {
 					info.line = &line2;
-					rnd_r_search(PCB->Data->padstack_tree, &line2.BoundingBox, NULL, drcPstk_callback, &info, NULL);
+					rnd_rtree_search_any(PCB->Data->padstack_tree, (rnd_rtree_box_t*)&line2.BoundingBox, NULL, drcPstk_callback, &info, NULL);
 				}
 				PCB_COPPER_GROUP_LOOP(PCB->Data, group);
 				{
 					info.line = &line1;
-					rnd_r_search(layer->line_tree, &line1.BoundingBox, NULL, drcLine_callback, &info, NULL);
-					rnd_r_search(layer->arc_tree, &line1.BoundingBox, NULL, drcArc_callback, &info, NULL);
+					rnd_rtree_search_any(layer->line_tree, (rnd_rtree_box_t*)&line1.BoundingBox, NULL, drcLine_callback, &info, NULL);
+					rnd_rtree_search_any(layer->arc_tree, (rnd_rtree_box_t*)&line1.BoundingBox, NULL, drcArc_callback, &info, NULL);
 					if (two_lines) {
 						info.line = &line2;
-						rnd_r_search(layer->line_tree, &line2.BoundingBox, NULL, drcLine_callback, &info, NULL);
-						rnd_r_search(layer->arc_tree, &line2.BoundingBox, NULL, drcArc_callback, &info, NULL);
+						rnd_rtree_search_any(layer->line_tree, (rnd_rtree_box_t*)&line2.BoundingBox, NULL, drcLine_callback, &info, NULL);
+						rnd_rtree_search_any(layer->arc_tree, (rnd_rtree_box_t*)&line2.BoundingBox, NULL, drcArc_callback, &info, NULL);
 					}
 				}
 				PCB_END_LOOP;
@@ -438,12 +438,12 @@
 	pcb_line_bbox(&line);
 	if (setjmp(info.env) == 0) {
 		info.line = &line;
-		rnd_r_search(PCB->Data->padstack_tree, &line.BoundingBox, NULL, drcPstk_callback, &info, NULL);
+		rnd_rtree_search_any(PCB->Data->padstack_tree, (rnd_rtree_box_t *)&line.BoundingBox, NULL, drcPstk_callback, &info, NULL);
 		PCB_COPPER_GROUP_LOOP(PCB->Data, group);
 		{
 			info.line = &line;
-			rnd_r_search(layer->line_tree, &line.BoundingBox, NULL, drcLine_callback, &info, NULL);
-			rnd_r_search(layer->arc_tree, &line.BoundingBox, NULL, drcArc_callback, &info, NULL);
+			rnd_rtree_search_any(layer->line_tree, (rnd_rtree_box_t *)&line.BoundingBox, NULL, drcLine_callback, &info, NULL);
+			rnd_rtree_search_any(layer->arc_tree, (rnd_rtree_box_t *)&line.BoundingBox, NULL, drcArc_callback, &info, NULL);
 		}
 		PCB_END_LOOP;
 		/* no intersector! */