Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 25993)
+++ trunk/doc/developer/renames	(revision 25994)
@@ -1779,3 +1779,5 @@
 pcb_hid_register_actions -> pcb_register_actions
 pcb_hid_actions_uninit -> pcb_actions_uninit
 pcb_hid_actions_init -> pcb_actions_init
+pcb_poly_from_arc -> pcb_poly_from_pcb_arc
+pcb_poly_from_line -> pcb_poly_from_pcb_line
Index: trunk/src/find_geo.c
===================================================================
--- trunk/src/find_geo.c	(revision 25993)
+++ trunk/src/find_geo.c	(revision 25994)
@@ -586,7 +586,7 @@
 			&& Box->Y1 <= Polygon->Clipped->contours->ymax + Bloat && Box->Y2 >= Polygon->Clipped->contours->ymin - Bloat) {
 		pcb_polyarea_t *ap;
 
-		if (!(ap = pcb_poly_from_arc(Arc, Arc->Thickness + Bloat)))
+		if (!(ap = pcb_poly_from_pcb_arc(Arc, Arc->Thickness + Bloat)))
 			return pcb_false;							/* error */
 		return pcb_poly_isects_poly(ap, Polygon, pcb_true);
 	}
@@ -603,7 +603,7 @@
 			&& (Box->Y1 <= pa->contours->ymax + Bloat) && (Box->Y2 >= pa->contours->ymin - Bloat)) {
 		pcb_polyarea_t *arcp;
 
-		if (!(arcp = pcb_poly_from_arc(Arc, Arc->Thickness + Bloat)))
+		if (!(arcp = pcb_poly_from_pcb_arc(Arc, Arc->Thickness + Bloat)))
 			return pcb_false; /* error */
 		res = pcb_polyarea_touching(arcp, pa);
 		pcb_polyarea_free(&arcp);
@@ -643,7 +643,7 @@
 	if (Box->X1 <= Polygon->Clipped->contours->xmax + Bloat
 			&& Box->X2 >= Polygon->Clipped->contours->xmin - Bloat
 			&& Box->Y1 <= Polygon->Clipped->contours->ymax + Bloat && Box->Y2 >= Polygon->Clipped->contours->ymin - Bloat) {
-		if (!(lp = pcb_poly_from_line(Line, Line->Thickness + Bloat)))
+		if (!(lp = pcb_poly_from_pcb_line(Line, Line->Thickness + Bloat)))
 			return pcb_false;							/* error */
 		return pcb_poly_isects_poly(lp, Polygon, pcb_true);
 	}
Index: trunk/src/obj_pinvia_therm.c
===================================================================
--- trunk/src/obj_pinvia_therm.c	(revision 25993)
+++ trunk/src/obj_pinvia_therm.c	(revision 25994)
@@ -127,23 +127,23 @@
 		a.Flags = pcb_no_flags();
 		a.Delta = 90 - (a.Clearance * (1. + 2. * pcb->ThermScale) * 180) / (M_PI * a.Width);
 		a.StartAngle = 90 - a.Delta / 2 + (style == 4 ? 0 : 45);
-		pa = pcb_poly_from_arc(&a, a.Clearance);
+		pa = pcb_poly_from_pcb_arc(&a, a.Clearance);
 		if (!pa)
 			return NULL;
 		a.StartAngle += 90;
-		arc = pcb_poly_from_arc(&a, a.Clearance);
+		arc = pcb_poly_from_pcb_arc(&a, a.Clearance);
 		if (!arc)
 			return NULL;
 		pa->f = arc;
 		arc->b = pa;
 		a.StartAngle += 90;
-		arc = pcb_poly_from_arc(&a, a.Clearance);
+		arc = pcb_poly_from_pcb_arc(&a, a.Clearance);
 		if (!arc)
 			return NULL;
 		pa->f->f = arc;
 		arc->b = pa->f;
 		a.StartAngle += 90;
-		arc = pcb_poly_from_arc(&a, a.Clearance);
+		arc = pcb_poly_from_pcb_arc(&a, a.Clearance);
 		if (!arc)
 			return NULL;
 		pa->b = arc;
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 25993)
+++ trunk/src/polygon.c	(revision 25994)
@@ -588,7 +588,7 @@
 }
 
 #define MIN_CLEARANCE_BEFORE_BISECT 10.
-pcb_polyarea_t *pcb_poly_from_arc(pcb_arc_t * a, pcb_coord_t thick)
+pcb_polyarea_t *pcb_poly_from_pcb_arc(pcb_arc_t * a, pcb_coord_t thick)
 {
 	double delta;
 	pcb_arc_t seg1, seg2;
@@ -609,12 +609,12 @@
 		pcb_arc_get_end(a, 0, &lin.Point1.X, &lin.Point1.Y);
 		lin.Point2.X = lin.Point1.X;
 		lin.Point2.Y = lin.Point1.Y;
-		tmp1 = pcb_poly_from_line(&lin, thick);
+		tmp1 = pcb_poly_from_pcb_line(&lin, thick);
 
 		pcb_arc_get_end(a, 1, &lin.Point1.X, &lin.Point1.Y);
 		lin.Point2.X = lin.Point1.X;
 		lin.Point2.Y = lin.Point1.Y;
-		tmp2 = pcb_poly_from_line(&lin, thick);
+		tmp2 = pcb_poly_from_pcb_line(&lin, thick);
 
 		pcb_polyarea_boolean_free(tmp1, tmp2, &ends, PCB_PBO_UNITE);
 		pcb_polyarea_boolean_free(ends, tmp_arc, &res, PCB_PBO_UNITE);
@@ -641,7 +641,7 @@
 	return ArcPolyNoIntersect(a, thick, 1);
 }
 
-pcb_polyarea_t *pcb_poly_from_line(pcb_line_t * L, pcb_coord_t thick)
+pcb_polyarea_t *pcb_poly_from_pcb_line(pcb_line_t * L, pcb_coord_t thick)
 {
 	pcb_pline_t *contour = NULL;
 	pcb_polyarea_t *np = NULL;
@@ -767,7 +767,7 @@
 {
 	if (line->thermal & PCB_THERMAL_ON)
 		return pcb_thermal_area_line(pcb, line, layernum);
-	return pcb_poly_from_line(line, line->Thickness + line->Clearance);
+	return pcb_poly_from_pcb_line(line, line->Thickness + line->Clearance);
 }
 
 static int SubtractLine(pcb_line_t * line, pcb_poly_t * p)
@@ -787,7 +787,7 @@
 
 	if (!PCB_NONPOLY_HAS_CLEARANCE(arc))
 		return 0;
-	if (!(np = pcb_poly_from_arc(arc, arc->Thickness + arc->Clearance)))
+	if (!(np = pcb_poly_from_pcb_arc(arc, arc->Thickness + arc->Clearance)))
 		return -1;
 	return Subtract(np, p, pcb_true);
 }
@@ -914,7 +914,7 @@
 	lin.Point2.Y = y2;
 	lin.Clearance = width;
 
-	return pcb_poly_from_line(&lin, width);
+	return pcb_poly_from_pcb_line(&lin, width);
 }
 
 #define pa_append(src) \
Index: trunk/src/polygon.h
===================================================================
--- trunk/src/polygon.h	(revision 25993)
+++ trunk/src/polygon.h	(revision 25994)
@@ -80,8 +80,8 @@
 pcb_polyarea_t *pcb_poly_from_rect(pcb_coord_t x1, pcb_coord_t x2, pcb_coord_t y1, pcb_coord_t y2);
 pcb_polyarea_t *pcb_poly_from_circle(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius);
 pcb_polyarea_t *pcb_poly_from_octagon(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, int style);
-pcb_polyarea_t *pcb_poly_from_line(pcb_line_t * l, pcb_coord_t thick);
-pcb_polyarea_t *pcb_poly_from_arc(pcb_arc_t * l, pcb_coord_t thick);
+pcb_polyarea_t *pcb_poly_from_pcb_line(pcb_line_t * l, pcb_coord_t thick);
+pcb_polyarea_t *pcb_poly_from_pcb_arc(pcb_arc_t * l, pcb_coord_t thick);
 pcb_polyarea_t *pcb_poly_from_box_bloated(pcb_box_t * box, pcb_coord_t radius);
 pcb_polyarea_t *pcb_poly_clearance_construct(pcb_poly_t *subpoly); /* clearance shape for when clearpolypoly is set */
 
Index: trunk/src/thermal.c
===================================================================
--- trunk/src/thermal.c	(revision 25993)
+++ trunk/src/thermal.c	(revision 25994)
@@ -113,7 +113,7 @@
 		ltmp.Flags = pcb_no_flags();
 	ltmp.Point1.X = pcb_round(x1); ltmp.Point1.Y = pcb_round(y1);
 	ltmp.Point2.X = pcb_round(x2); ltmp.Point2.Y = pcb_round(y2);
-	return pcb_poly_from_line(&ltmp, clr);
+	return pcb_poly_from_pcb_line(&ltmp, clr);
 }
 
 /* generate a round-cap arc polygon knowing the center and endpoints */
@@ -146,7 +146,7 @@
 		atmp.Delta = 360-ea+sa;
 	}
 	atmp.Width = atmp.Height = r;
-	return pcb_poly_from_arc(&atmp, clr);
+	return pcb_poly_from_pcb_arc(&atmp, clr);
 }
 
 pcb_polyarea_t *pcb_thermal_area_line(pcb_board_t *pcb, pcb_line_t *line, pcb_layer_id_t lid)
@@ -359,7 +359,7 @@
 			}
 			return pc;
 		case PCB_THERMAL_SHARP:
-			pa = pcb_poly_from_line(line, line->Thickness + line->Clearance);
+			pa = pcb_poly_from_pcb_line(line, line->Thickness + line->Clearance);
 			th = line->Thickness/2 < clr ? line->Thickness/2 : clr;
 			clrth *= 2;
 			if (line->thermal & PCB_THERMAL_DIAGONAL) {
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 25993)
+++ trunk/src_plugins/jostle/jostle.c	(revision 25994)
@@ -271,7 +271,7 @@
 
 	line = Createpcb_vector_tLineOnLayer(layer, a, b, orig->Thickness, orig->Clearance, orig->Flags);
 	if (line && expandp) {
-		pcb_polyarea_t *p = pcb_poly_from_line(line, line->Thickness + line->Clearance);
+		pcb_polyarea_t *p = pcb_poly_from_pcb_line(line, line->Thickness + line->Clearance);
 		pcb_polyarea_boolean_free(*expandp, p, expandp, PCB_PBO_UNITE);
 	}
 	return line;
@@ -364,7 +364,7 @@
 		pcb_fprintf(stderr, "\tinside2 %ms,%ms\n", p[0], p[1]);
 		inside++;
 	}
-	lp = pcb_poly_from_line(line, line->Thickness);
+	lp = pcb_poly_from_pcb_line(line, line->Thickness);
 	if (!pcb_polyarea_touching(lp, info->brush)) {
 		/* not a factor */
 		return 0;
@@ -381,7 +381,7 @@
 	 * Cut the brush with the line to figure out which side to go
 	 * around.  Use a very fine line.  XXX can still graze.
 	 */
-	lp = pcb_poly_from_line(line, 1);
+	lp = pcb_poly_from_pcb_line(line, 1);
 	if (!pcb_polyarea_m_copy0(&copy, info->brush))
 		return 0;
 	r = pcb_polyarea_boolean_free(copy, lp, &tmp, PCB_PBO_SUB);
@@ -394,7 +394,7 @@
 		 * to get the glancing sliver??
 		 */
 		pcb_fprintf(stderr, "try isect??\n");
-		lp = pcb_poly_from_line(line, line->Thickness);
+		lp = pcb_poly_from_pcb_line(line, line->Thickness);
 		r = pcb_polyarea_boolean_free(tmp, lp, &tmp, PCB_PBO_ISECT);
 		if (r != pcb_err_ok) {
 			fprintf(stderr, "Error while jostling PCB_PBO_ISECT: %d\n", r);