Index: read.c
===================================================================
--- read.c	(revision 30912)
+++ read.c	(revision 30913)
@@ -710,7 +710,7 @@
 {
 	pcb_poly_t *poly;
 	lht_node_t *geo;
-	pcb_cardinal_t n = 0, c;
+	rnd_cardinal_t n = 0, c;
 	unsigned char intconn = 0;
 	int err = 0;
 	long int id;
@@ -747,13 +747,13 @@
 		poly->Points = malloc(sizeof(pcb_point_t) * poly->PointMax);
 		poly->HoleIndexMax = poly->HoleIndexN = c-1;
 		if (poly->HoleIndexN > 0)
-			poly->HoleIndex = malloc(sizeof(pcb_cardinal_t) * poly->HoleIndexMax);
+			poly->HoleIndex = malloc(sizeof(rnd_cardinal_t) * poly->HoleIndexMax);
 		else
 			poly->HoleIndex = NULL;
 
 		/* convert points and build hole index */
 		for(c = 0, cnt = lht_dom_first(&it, geo); cnt != NULL; c++, cnt = lht_dom_next(&it)) {
-			pcb_cardinal_t r;
+			rnd_cardinal_t r;
 			if (cnt->type != LHT_TABLE)
 				continue;
 			if (c > 0)
@@ -1630,7 +1630,7 @@
 static int parse_data_pstk_shape_poly(pcb_board_t *pcb, pcb_pstk_shape_t *dst, lht_node_t *nshape, pcb_data_t *subc_parent)
 {
 	lht_node_t *n;
-	pcb_cardinal_t i;
+	rnd_cardinal_t i;
 
 	dst->shape = PCB_PSSH_POLY;
 	dst->data.poly.x = NULL; /* if we return before the allocation... */
@@ -1796,7 +1796,7 @@
 
 static int parse_data_pstk_protos(pcb_board_t *pcb, pcb_data_t *dst, lht_node_t *pp, pcb_data_t *subc_parent)
 {
-	pcb_cardinal_t pid, len;
+	rnd_cardinal_t pid, len;
 	lht_node_t *pr;
 	int res = 0;
 
Index: write.c
===================================================================
--- write.c	(revision 30912)
+++ write.c	(revision 30913)
@@ -493,7 +493,7 @@
 {
 	char buff[128];
 	lht_node_t *obj, *tbl, *geo;
-	pcb_cardinal_t n, hole = 0;
+	rnd_cardinal_t n, hole = 0;
 
 	sprintf(buff, "polygon.%ld", poly->ID);
 	obj = lht_dom_node_alloc(LHT_HASH, buff);
@@ -715,7 +715,7 @@
 static lht_node_t *build_pstk_protos(pcb_data_t *data, pcb_vtpadstack_proto_t *pp)
 {
 	lht_node_t *lst, *nproto, *nmask, *nshape, *nshapelst, *ncomb, *nshapeo;
-	pcb_cardinal_t n, sn, pn;
+	rnd_cardinal_t n, sn, pn;
 	pcb_pstk_tshape_t *ts;
 	char tmp[64];
 	pcb_layer_type_t lyt_permit = PCB_LYT_ANYWHERE | PCB_LYT_COPPER | PCB_LYT_SILK | PCB_LYT_MASK | PCB_LYT_PASTE;