Index: centgeo.c
===================================================================
--- centgeo.c	(revision 30911)
+++ centgeo.c	(revision 30912)
@@ -40,7 +40,7 @@
 /* Note about all intersection code: same basic algo as in find_geo.c -
    see comment for the algo description there */
 
-int pcb_intersect_cline_cline(pcb_line_t *Line1, pcb_line_t *Line2, pcb_box_t *ip, double offs[2])
+int pcb_intersect_cline_cline(pcb_line_t *Line1, pcb_line_t *Line2, rnd_box_t *ip, double offs[2])
 {
 	double s, r;
 	double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy;
@@ -170,7 +170,7 @@
 		return found; \
 } while(0)
 
-static int intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, pcb_box_t *ip, double offs[2], int oline)
+static int intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, rnd_box_t *ip, double offs[2], int oline)
 {
 	double dx, dy, dx1, dy1, l, d, r, r2, Radius;
 	rnd_coord_t ex, ey, ix, iy;
@@ -260,12 +260,12 @@
 	return found;
 }
 
-int pcb_intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, pcb_box_t *ip, double offs[2])
+int pcb_intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, rnd_box_t *ip, double offs[2])
 {
 	return intersect_cline_carc(Line, Arc, ip, offs, 1);
 }
 
-int pcb_intersect_carc_cline(pcb_arc_t *Arc, pcb_line_t *Line, pcb_box_t *ip, double offs[2])
+int pcb_intersect_carc_cline(pcb_arc_t *Arc, pcb_line_t *Line, rnd_box_t *ip, double offs[2])
 {
 	return intersect_cline_carc(Line, Arc, ip, offs, 0);
 }
@@ -344,7 +344,7 @@
 	return (sa + d - 360) >= alpha;
 }
 
-int pcb_intersect_carc_carc(pcb_arc_t *Arc1, pcb_arc_t *Arc2, pcb_box_t *ip, double offs[2])
+int pcb_intersect_carc_carc(pcb_arc_t *Arc1, pcb_arc_t *Arc2, rnd_box_t *ip, double offs[2])
 {
 	double x, y, dx, dy, r1, r2, a, d, l, dl;
 	rnd_coord_t pdx, pdy;
Index: centgeo.h
===================================================================
--- centgeo.h	(revision 30911)
+++ centgeo.h	(revision 30912)
@@ -10,7 +10,7 @@
    0 = no intersection
    1 = one intersection (X1;Y1 of ip is loaded)
    2 = overlapping segments (overlap endpoitns are stored in X1;Y1 and X2;Y2 of ip) */
-int pcb_intersect_cline_cline(pcb_line_t *Line1, pcb_line_t *Line2, pcb_box_t *ip, double offs[2]);
+int pcb_intersect_cline_cline(pcb_line_t *Line1, pcb_line_t *Line2, rnd_box_t *ip, double offs[2]);
 
 /* Calculate the intersection point(s) of a lines and an arc and store them
    in ip and/or offs if they are not NULL. Returns:
@@ -17,8 +17,8 @@
    0 = no intersection
    1 = one intersection (X1;Y1 of ip is loaded)
    2 = two intersections (stored in X1;Y1 and X2;Y2 of ip) */
-int pcb_intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, pcb_box_t *ip, double offs_line[2]);
-int pcb_intersect_carc_cline(pcb_arc_t *Arc, pcb_line_t *Line, pcb_box_t *ip, double offs_arc[2]);
+int pcb_intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, rnd_box_t *ip, double offs_line[2]);
+int pcb_intersect_carc_cline(pcb_arc_t *Arc, pcb_line_t *Line, rnd_box_t *ip, double offs_arc[2]);
 
 /* Calculate the intersection point(s) of two arcs and store them in ip
    and/or offs (on Line1) if they are not NULL. Returns:
@@ -25,7 +25,7 @@
    0 = no intersection
    1 = one intersection (X1;Y1 of ip is loaded)
    2 = two intersections or overlapping segments (overlap endpoints are stored in X1;Y1 and X2;Y2 of ip) */
-int pcb_intersect_carc_carc(pcb_arc_t *Arc1, pcb_arc_t *Arc2, pcb_box_t *ip, double offs[2]);
+int pcb_intersect_carc_carc(pcb_arc_t *Arc1, pcb_arc_t *Arc2, rnd_box_t *ip, double offs[2]);
 
 
 /* Calculate the point on an object corresponding to a [0..1] offset and store
Index: cli_line.c
===================================================================
--- cli_line.c	(revision 30911)
+++ cli_line.c	(revision 30912)
@@ -1,4 +1,4 @@
-static int line_parse(char *line, int argc, cli_node_t *argv, pcb_box_t *box, int verbose, int annot)
+static int line_parse(char *line, int argc, cli_node_t *argv, rnd_box_t *box, int verbose, int annot)
 {
 	int n = 0;
 
@@ -39,7 +39,7 @@
 static int line_exec(char *line, int argc, cli_node_t *argv)
 {
 	int res;
-	pcb_box_t box;
+	rnd_box_t box;
 
 	pcb_trace("line e: '%s'\n", line);
 
@@ -58,7 +58,7 @@
 static int line_edit(char *line, int cursor, int argc, cli_node_t *argv)
 {
 	int res;
-	pcb_box_t box;
+	rnd_box_t box;
 
 	pcb_ddraft_attached_reset();