Index: polygon.h
===================================================================
--- polygon.h	(revision 4801)
+++ polygon.h	(revision 4802)
@@ -61,20 +61,20 @@
 void GoToPreviousPoint(void);
 void ClosePolygon(void);
 void CopyAttachedPolygonToLayer(void);
-int PolygonHoles(pcb_polygon_t * ptr, const pcb_box_t * range, int (*callback) (PLINE *, void *user_data), void *user_data);
+int PolygonHoles(pcb_polygon_t * ptr, const pcb_box_t * range, int (*callback) (pcb_pline_t *, void *user_data), void *user_data);
 int PlowsPolygon(pcb_data_t *, int, void *, void *,
 								 r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_polygon_t *, int, void *, void *));
 void ComputeNoHoles(pcb_polygon_t * poly);
-POLYAREA *ContourToPoly(PLINE *);
-POLYAREA *PolygonToPoly(pcb_polygon_t *);
-POLYAREA *RectPoly(Coord x1, Coord x2, Coord y1, Coord y2);
-POLYAREA *CirclePoly(Coord x, Coord y, Coord radius);
-POLYAREA *OctagonPoly(Coord x, Coord y, Coord radius, int style);
-POLYAREA *LinePoly(pcb_line_t * l, Coord thick);
-POLYAREA *ArcPoly(pcb_arc_t * l, Coord thick);
-POLYAREA *PinPoly(pcb_pin_t * l, Coord thick, Coord clear);
-POLYAREA *BoxPolyBloated(pcb_box_t * box, Coord radius);
-void frac_circle(PLINE *, Coord, Coord, pcb_vector_t, int);
+pcb_polyarea_t *ContourToPoly(pcb_pline_t *);
+pcb_polyarea_t *PolygonToPoly(pcb_polygon_t *);
+pcb_polyarea_t *RectPoly(Coord x1, Coord x2, Coord y1, Coord y2);
+pcb_polyarea_t *CirclePoly(Coord x, Coord y, Coord radius);
+pcb_polyarea_t *OctagonPoly(Coord x, Coord y, Coord radius, int style);
+pcb_polyarea_t *LinePoly(pcb_line_t * l, Coord thick);
+pcb_polyarea_t *ArcPoly(pcb_arc_t * l, Coord thick);
+pcb_polyarea_t *PinPoly(pcb_pin_t * l, Coord thick, Coord clear);
+pcb_polyarea_t *BoxPolyBloated(pcb_box_t * box, Coord radius);
+void frac_circle(pcb_pline_t *, Coord, Coord, pcb_vector_t, int);
 int InitClip(pcb_data_t * d, pcb_layer_t * l, pcb_polygon_t * p);
 void RestoreToPolygon(pcb_data_t *, int, void *, void *);
 void ClearFromPolygon(pcb_data_t *, int, void *, void *);
@@ -82,10 +82,10 @@
 pcb_bool IsPointInPolygon(Coord, Coord, Coord, pcb_polygon_t *);
 pcb_bool IsPointInPolygonIgnoreHoles(Coord, Coord, pcb_polygon_t *);
 pcb_bool IsRectangleInPolygon(Coord, Coord, Coord, Coord, pcb_polygon_t *);
-pcb_bool isects(POLYAREA *, pcb_polygon_t *, pcb_bool);
+pcb_bool isects(pcb_polyarea_t *, pcb_polygon_t *, pcb_bool);
 pcb_bool MorphPolygon(pcb_layer_t *, pcb_polygon_t *);
-void NoHolesPolygonDicer(pcb_polygon_t * p, const pcb_box_t * clip, void (*emit) (PLINE *, void *), void *user_data);
-void PolyToPolygonsOnLayer(pcb_data_t *, pcb_layer_t *, POLYAREA *, pcb_flag_t);
+void NoHolesPolygonDicer(pcb_polygon_t * p, const pcb_box_t * clip, void (*emit) (pcb_pline_t *, void *), void *user_data);
+void PolyToPolygonsOnLayer(pcb_data_t *, pcb_layer_t *, pcb_polyarea_t *, pcb_flag_t);
 
 void square_pin_factors(int style, double *xm, double *ym);