Index: dsn.c
===================================================================
--- dsn.c	(revision 30954)
+++ dsn.c	(revision 30955)
@@ -68,17 +68,17 @@
 		return -1;
 
 	if (strcmp(end+2, grp->name) != 0) {
-		rnd_message(PCB_MSG_ERROR, "layer (group) name mismatch: group %ld should be '%s' but is '%s'\nses file not for this board?\n", gid, grp->name, end+2);
+		rnd_message(RND_MSG_ERROR, "layer (group) name mismatch: group %ld should be '%s' but is '%s'\nses file not for this board?\n", gid, grp->name, end+2);
 		return -1;
 	}
 
 	if (grp->len <= 0) {
-		rnd_message(PCB_MSG_ERROR, "layer (group) '%s' has no layers\nses file not for this board?\n", name);
+		rnd_message(RND_MSG_ERROR, "layer (group) '%s' has no layers\nses file not for this board?\n", name);
 		return -1;
 	}
 
 	if (!(grp->ltype & PCB_LYT_COPPER)) {
-		rnd_message(PCB_MSG_ERROR, "layer (group) type %s should a copper layer group\nses file not for this board?\n", name);
+		rnd_message(RND_MSG_ERROR, "layer (group) type %s should a copper layer group\nses file not for this board?\n", name);
 		return -1;
 	}
 
@@ -98,13 +98,13 @@
 
 	thick = pcb_get_value(sthick, unit, NULL, &succ);
 	if (!succ) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: skipping polyline because thickness is invalid: %s\n", sthick);
+		rnd_message(RND_MSG_ERROR, "import_dsn: skipping polyline because thickness is invalid: %s\n", sthick);
 		return;
 	}
 
 	lid = ses_layer_by_name(PCB, slayer);
 	if (lid < 0) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: skipping polyline because layer name is invalid: %s\n", slayer);
+		rnd_message(RND_MSG_ERROR, "import_dsn: skipping polyline because layer name is invalid: %s\n", slayer);
 		return;
 	}
 	layer = PCB->Data->Layer+lid;
@@ -115,12 +115,12 @@
 		const char *sy = c->next->str;
 		x = pcb_get_value(sx, unit, NULL, &succ);
 		if (!succ) {
-			rnd_message(PCB_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sx);
+			rnd_message(RND_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sx);
 			return;
 		}
 		y = pcb_get_value(sy, unit, NULL, &succ);
 		if (!succ) {
-			rnd_message(PCB_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sy);
+			rnd_message(RND_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sy);
 			return;
 		}
 		if (workaround0 && ((y < PCB_MM_TO_COORD(0.01)) || (x < PCB_MM_TO_COORD(0.01)))) /* workaround for broken polyline coords */
@@ -155,7 +155,7 @@
 			/* ignore */
 		}
 		else
-			rnd_message(PCB_MSG_WARNING, "import_dsn: ignoring unknown wire directive %s\n", n->str);
+			rnd_message(RND_MSG_WARNING, "import_dsn: ignoring unknown wire directive %s\n", n->str);
 	}
 }
 
@@ -171,13 +171,13 @@
 	const char *unit = (type == TYPE_PCB) ? "mm" : "nm";
 
 	if (strncmp(name, "via_", 4) != 0) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: skipping via with invalid name (prefix): %s\n", name);
+		rnd_message(RND_MSG_ERROR, "import_dsn: skipping via with invalid name (prefix): %s\n", name);
 		return;
 	}
 
 	name += 4;
 	if (sscanf(name, "%ld_%ld", &l1, &l2) != 2) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: skipping via with invalid name (diameters): %s\n", name);
+		rnd_message(RND_MSG_ERROR, "import_dsn: skipping via with invalid name (diameters): %s\n", name);
 		return;
 	}
 
@@ -186,12 +186,12 @@
 
 	x = pcb_get_value(sx, unit, NULL, &succ);
 	if (!succ) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: skipping via segment because x coord is invalid: %s\n", sx);
+		rnd_message(RND_MSG_ERROR, "import_dsn: skipping via segment because x coord is invalid: %s\n", sx);
 		return;
 	}
 	y = pcb_get_value(sy, unit, NULL, &succ);
 	if (!succ) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: skipping via segment because x coord is invalid: %s\n", sy);
+		rnd_message(RND_MSG_ERROR, "import_dsn: skipping via segment because x coord is invalid: %s\n", sy);
 		return;
 	}
 
@@ -231,7 +231,7 @@
 	/* load and parse the file into a dom tree */
 	f = pcb_fopen(&PCB->hidlib, fname, "r");
 	if (f == NULL) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: can't open %s for read\n", fname);
+		rnd_message(RND_MSG_ERROR, "import_dsn: can't open %s for read\n", fname);
 		return 1;
 	}
 	gsxl_init(&dom, gsxl_node_t);
@@ -252,7 +252,7 @@
 	fclose(f);
 
 	if (rs != GSX_RES_EOE) {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: parse error in %s at %d:%d\n", fname, dom.parse.line, dom.parse.col);
+		rnd_message(RND_MSG_ERROR, "import_dsn: parse error in %s at %d:%d\n", fname, dom.parse.line, dom.parse.col);
 		goto error;
 	}
 	gsxl_compact_tree(&dom);
@@ -265,7 +265,7 @@
 	else if (strcmp(dom.root->str, "session") == 0)
 		type = TYPE_SESSION;
 	else {
-		rnd_message(PCB_MSG_ERROR, "import_dsn: s-expr is not a PCB or session\n");
+		rnd_message(RND_MSG_ERROR, "import_dsn: s-expr is not a PCB or session\n");
 		goto error;
 	}
 
@@ -276,7 +276,7 @@
 					break;
 
 			if (wiring == NULL) {
-				rnd_message(PCB_MSG_ERROR, "import_dsn: s-expr does not have a wiring section\n");
+				rnd_message(RND_MSG_ERROR, "import_dsn: s-expr does not have a wiring section\n");
 				goto error;
 			}
 
@@ -296,7 +296,7 @@
 					break;
 
 			if (routes == NULL) {
-				rnd_message(PCB_MSG_ERROR, "import_dsn: s-expr does not have a routes section\n");
+				rnd_message(RND_MSG_ERROR, "import_dsn: s-expr does not have a routes section\n");
 				goto error;
 			}
 
@@ -305,7 +305,7 @@
 					break;
 
 			if (nout == NULL) {
-				rnd_message(PCB_MSG_ERROR, "import_dsn: s-expr does not have a network_out section\n");
+				rnd_message(RND_MSG_ERROR, "import_dsn: s-expr does not have a network_out section\n");
 				goto error;
 			}
 
@@ -322,7 +322,7 @@
 			break;
 	}
 
-	rnd_message(PCB_MSG_INFO, "import_dsn: loaded %ld wires and %ld vias\n", nlines, nvias);
+	rnd_message(RND_MSG_INFO, "import_dsn: loaded %ld wires and %ld vias\n", nlines, nvias);
 
 	gsxl_uninit(&dom);
 	RND_ACT_IRES(0);