Index: obj_pinvia_therm.c
===================================================================
--- obj_pinvia_therm.c	(revision 5068)
+++ obj_pinvia_therm.c	(revision 5069)
@@ -318,20 +318,20 @@
 	p = pcb_poly_from_octagon(pin->X, pin->Y, w, PCB_FLAG_SQUARE_GET(pin));
 	p2 = pcb_poly_from_octagon(pin->X, pin->Y, pin->Thickness, PCB_FLAG_SQUARE_GET(pin));
 	/* make full clearance ring */
-	pcb_polyarea_boolean_free(p, p2, &m, PBO_SUB);
+	pcb_polyarea_boolean_free(p, p2, &m, PCB_PBO_SUB);
 	switch (style) {
 	default:
 	case 1:
 		p = diag_line(pin->X, pin->Y, w, t, pcb_true);
-		pcb_polyarea_boolean_free(m, p, &p2, PBO_SUB);
+		pcb_polyarea_boolean_free(m, p, &p2, PCB_PBO_SUB);
 		p = diag_line(pin->X, pin->Y, w, t, pcb_false);
-		pcb_polyarea_boolean_free(p2, p, &m, PBO_SUB);
+		pcb_polyarea_boolean_free(p2, p, &m, PCB_PBO_SUB);
 		return m;
 	case 2:
 		p = pcb_poly_from_rect(pin->X - t, pin->X + t, pin->Y - w, pin->Y + w);
-		pcb_polyarea_boolean_free(m, p, &p2, PBO_SUB);
+		pcb_polyarea_boolean_free(m, p, &p2, PCB_PBO_SUB);
 		p = pcb_poly_from_rect(pin->X - w, pin->X + w, pin->Y - t, pin->Y + t);
-		pcb_polyarea_boolean_free(p2, p, &m, PBO_SUB);
+		pcb_polyarea_boolean_free(p2, p, &m, PCB_PBO_SUB);
 		return m;
 		/* fix me add thermal style 4 */
 	case 5:
@@ -341,8 +341,8 @@
 			/* cheat by using the square therm's rounded parts */
 			p = square_therm(pin, style);
 			q = pcb_poly_from_rect(pin->X - t, pin->X + t, pin->Y - t, pin->Y + t);
-			pcb_polyarea_boolean_free(p, q, &p2, PBO_UNITE);
-			pcb_polyarea_boolean_free(m, p2, &p, PBO_ISECT);
+			pcb_polyarea_boolean_free(p, q, &p2, PCB_PBO_UNITE);
+			pcb_polyarea_boolean_free(m, p2, &p, PCB_PBO_ISECT);
 			return p;
 		}
 	}
@@ -377,7 +377,7 @@
 			pa = pcb_poly_from_circle(pin->X, pin->Y, t);
 			arc = pcb_poly_from_circle(pin->X, pin->Y, pin->Thickness / 2);
 			/* create a thin ring */
-			pcb_polyarea_boolean_free(pa, arc, &m, PBO_SUB);
+			pcb_polyarea_boolean_free(pa, arc, &m, PCB_PBO_SUB);
 			/* fix me needs error checking */
 			if (style == 2) {
 				/* t is the theoretically required length, but we use twice that
@@ -384,7 +384,7 @@
 				 * to avoid descritisation errors in our circle approximation.
 				 */
 				pa = pcb_poly_from_rect(pin->X - t * 2, pin->X + t * 2, pin->Y - w, pin->Y + w);
-				pcb_polyarea_boolean_free(m, pa, &arc, PBO_SUB);
+				pcb_polyarea_boolean_free(m, pa, &arc, PCB_PBO_SUB);
 				pa = pcb_poly_from_rect(pin->X - w, pin->X + w, pin->Y - t * 2, pin->Y + t * 2);
 			}
 			else {
@@ -392,10 +392,10 @@
 				 * to avoid descritisation errors in our circle approximation.
 				 */
 				pa = diag_line(pin->X, pin->Y, t * 2, w, pcb_true);
-				pcb_polyarea_boolean_free(m, pa, &arc, PBO_SUB);
+				pcb_polyarea_boolean_free(m, pa, &arc, PCB_PBO_SUB);
 				pa = diag_line(pin->X, pin->Y, t * 2, w, pcb_false);
 			}
-			pcb_polyarea_boolean_free(arc, pa, &m, PBO_SUB);
+			pcb_polyarea_boolean_free(arc, pa, &m, PCB_PBO_SUB);
 			return m;
 		}