Index: svg.c
===================================================================
--- svg.c	(revision 30977)
+++ svg.c	(revision 30978)
@@ -69,9 +69,9 @@
 static pcb_cam_t svg_cam;
 
 typedef struct rnd_hid_gc_s {
-	pcb_core_gc_t core_gc;
+	rnd_core_gc_t core_gc;
 	rnd_hid_t *me_pointer;
-	pcb_cap_style_t cap;
+	rnd_cap_style_t cap;
 	int width;
 	char *color;
 	int drill;
@@ -78,12 +78,12 @@
 	unsigned warned_elliptical:1;
 } rnd_hid_gc_s;
 
-static const char *CAPS(pcb_cap_style_t cap)
+static const char *CAPS(rnd_cap_style_t cap)
 {
 	switch (cap) {
-		case pcb_cap_round:
+		case rnd_cap_round:
 			return "round";
-		case pcb_cap_square:
+		case rnd_cap_square:
 			return "square";
 		default:
 			assert(!"unhandled cap");
@@ -475,7 +475,7 @@
 {
 	rnd_hid_gc_t rv = (rnd_hid_gc_t) calloc(sizeof(rnd_hid_gc_s), 1);
 	rv->me_pointer = &svg_hid;
-	rv->cap = pcb_cap_round;
+	rv->cap = rnd_cap_round;
 	rv->width = 1;
 	rv->color = NULL;
 	return rv;
@@ -556,7 +556,7 @@
 	gc->color = rnd_strdup(name);
 }
 
-static void svg_set_line_cap(rnd_hid_gc_t gc, pcb_cap_style_t style)
+static void svg_set_line_cap(rnd_hid_gc_t gc, rnd_cap_style_t style)
 {
 	gc->cap = style;
 }