Index: puller.c
===================================================================
--- puller.c	(revision 30912)
+++ puller.c	(revision 30913)
@@ -107,7 +107,7 @@
 
 static int within(int x1, int y1, int x2, int y2, int r)
 {
-	return pcb_distance(x1, y1, x2, y2) <= r / 2;
+	return rnd_distance(x1, y1, x2, y2) <= r / 2;
 }
 
 static int arc_endpoint_is(pcb_arc_t *a, int angle, int x, int y)
@@ -139,7 +139,7 @@
 #if TRACE1
 	pcb_printf(" - arc endpoint %#mD\n", ax, ay);
 #endif
-	arc_dist = pcb_distance(ax, ay, x, y);
+	arc_dist = rnd_distance(ax, ay, x, y);
 	if (arc_exact)
 		return arc_dist < 2;
 	return arc_dist < a->Thickness / 2;
@@ -232,7 +232,7 @@
 /* distance between a line and a point */
 static double dist_lp(int x1, int y1, int x2, int y2, int px, int py)
 {
-	double den = pcb_distance(x1, y1, x2, y2);
+	double den = rnd_distance(x1, y1, x2, y2);
 	double rv = (fabs(((double) x2 - x1) * ((double) y1 - py)
 										- ((double) x1 - px) * ((double) y2 - y1))
 							 / den);
@@ -256,8 +256,8 @@
 #if TRACE1
 	pcb_printf("line %#mD .. %#mD\n", l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y);
 #endif
-	d1 = pcb_distance(l->Point1.X, l->Point1.Y, x, y);
-	d2 = pcb_distance(l->Point2.X, l->Point2.Y, x, y);
+	d1 = rnd_distance(l->Point1.X, l->Point1.Y, x, y);
+	d2 = rnd_distance(l->Point2.X, l->Point2.Y, x, y);
 	if ((d1 < 2 || d2 < 2) && !line_exact) {
 		line_exact = 1;
 		the_line = 0;
@@ -403,7 +403,7 @@
 		arc_angle = the_arc->StartAngle + the_arc->Delta - 90;
 	base_angle = r2d(atan2(ey - cy, cx - ex));
 
-	tangent = r2d(acos(the_arc->Width / pcb_distance(cx, cy, ex, ey)));
+	tangent = r2d(acos(the_arc->Width / rnd_distance(cx, cy, ex, ey)));
 
 #if TRACE1
 	line_angle = r2d(atan2(ey - y, x - ex));
@@ -1135,7 +1135,7 @@
 	r = t + thickness;
 
 	/* See if the point is inside our start arc. */
-	d = pcb_distance(scx, scy, x, y);
+	d = rnd_distance(scx, scy, x, y);
 #if TRACE1
 	pcb_printf("%f = dist #mD to %#mD\n", d, scx, scy, x, y);
 	pcb_printf("sr %#mS r %f d %f\n", sr, r, d);
@@ -1233,9 +1233,9 @@
 	printf("%f * %f < %f * %f ?\n", a, se_sign, best_angle, se_sign);
 #endif
 	if (a * se_sign == best_angle * se_sign) {
-		double old_d = pcb_distance(start_line->Point1.X, start_line->Point1.Y,
+		double old_d = rnd_distance(start_line->Point1.X, start_line->Point1.Y,
 														fx, fy);
-		double new_d = pcb_distance(start_line->Point1.X, start_line->Point1.Y,
+		double new_d = rnd_distance(start_line->Point1.X, start_line->Point1.Y,
 														x, y);
 		if (new_d > old_d) {
 			best_angle = a;
@@ -1729,7 +1729,7 @@
 		abort();
 	}
 
-	end_dist = pcb_distance(end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y);
+	end_dist = rnd_distance(end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y);
 
 	start_pinpad = start_extra->start.pin;
 	end_pinpad = start_extra->end.pin;
@@ -1845,7 +1845,7 @@
 		pcb_printf("obstacle at %#mD angle %d = arc starts at %#mD\n", fx, fy, (int) r2d(oa), (int) ox, (int) oy);
 #endif
 
-		if (pcb_distance(ox, oy, end_line->Point2.X, end_line->Point2.Y)
+		if (rnd_distance(ox, oy, end_line->Point2.X, end_line->Point2.Y)
 				< fr * SIN1D) {
 			/* Pretend it doesn't exist.  */
 			fx = ex;