Index: shape.c
===================================================================
--- shape.c	(revision 17328)
+++ shape.c	(revision 17329)
@@ -315,10 +315,10 @@
 
 static const char pcb_acts_regpoly[] = "regpoly([where,] corners, radius [,rotation])";
 static const char pcb_acth_regpoly[] = "Generate regular polygon. Where is x;y and radius is either r or rx;ry. Rotation is in degrees.";
-int pcb_act_regpoly(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
+int pcb_act_regpoly(int argc, const char **argv)
 {
 	double rot = 0;
-	pcb_coord_t rx, ry = 0;
+	pcb_coord_t x, y, rx, ry = 0;
 	pcb_bool succ, have_coords = pcb_false;
 	int corners = 0, a;
 	pcb_data_t *data;
@@ -372,12 +372,12 @@
 
 static const char pcb_acts_roundrect[] = "roundrect([where,] width[;height] [,rx[;ry] [,rotation]])";
 static const char pcb_acth_roundrect[] = "Generate a rectangle with round corners";
-int pcb_act_roundrect(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
+int pcb_act_roundrect(int argc, const char **argv)
 {
 	int a;
 	pcb_data_t *data;
 	pcb_bool succ, have_coords = pcb_false;
-	pcb_coord_t w, h, rx, ry;
+	pcb_coord_t x, y, w, h, rx, ry;
 	double rot = 0.0;
 	char *end;
 
@@ -433,12 +433,12 @@
 
 static const char pcb_acts_circle[] = "circle([where,] diameter)";
 static const char pcb_acth_circle[] = "Generate a filled circle (zero length round cap line)";
-int pcb_act_circle(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
+int pcb_act_circle(int argc, const char **argv)
 {
 	int a;
 	pcb_data_t *data;
 	pcb_bool succ, have_coords = pcb_false;
-	pcb_coord_t dia;
+	pcb_coord_t x, y, dia;
 
 	if (argc < 1) {
 		pcb_message(PCB_MSG_ERROR, "circle() needs at least one parameters (diameter)\n");
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 17328)
+++ shape_dialog.c	(revision 17329)
@@ -354,7 +354,7 @@
 
 static const char pcb_acts_shape[] = "shape()";
 static const char pcb_acth_shape[] = "Interactive shape generator.";
-int pcb_act_shape(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
+int pcb_act_shape(int argc, const char **argv)
 {
 	pcb_shape_dialog(PCB, PCB_PASTEBUFFER->Data, pcb_shape_current_layer, pcb_false);
 	return 0;