Index: rubberband.c
===================================================================
--- rubberband.c	(revision 30912)
+++ rubberband.c	(revision 30913)
@@ -421,8 +421,8 @@
 		board = PCB;
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const rnd_coord_t t = Line->Thickness / 2;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 		struct rubber_info info;
@@ -462,8 +462,8 @@
 		board = PCB;
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const rnd_coord_t t = Line->Thickness / 2;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 		struct rubber_info info;
@@ -503,8 +503,8 @@
 		board = PCB;
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const rnd_coord_t t = Arc->Thickness / 2;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 		struct rubber_info info;
@@ -553,8 +553,8 @@
 		board = PCB;
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 
 		for(which = 0; which <= 1; ++which) {
@@ -601,8 +601,8 @@
 	group = pcb_layer_get_group_(Layer);
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 
 		for(entry = 0; entry < length; ++entry) {
@@ -666,8 +666,8 @@
 		board = PCB;
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 
 		for(entry = 0; entry < length; ++entry) {
@@ -733,8 +733,8 @@
 		board = PCB;
 
 	if (group >= 0) {
-		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
-		pcb_cardinal_t entry;
+		rnd_cardinal_t length = board->LayerGroups.grp[group].len;
+		rnd_cardinal_t entry;
 		const int comb = Layer->comb & PCB_LYC_SUB;
 
 		for(entry = 0; entry < length; ++entry) {
@@ -1133,7 +1133,7 @@
 {
 	rubber_ctx_t *rbnd = user_data;
 	pcb_rb_line_t *ptr;
-	pcb_cardinal_t i;
+	rnd_cardinal_t i;
 	int direct = argv[1].d.i;
 
 	/* draw the attached rubberband lines too */