[Freeciv-Dev] (PR#11203) gui-xaw compile problems again

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11203 >

Here's a patch.

Index: client/gui-xaw/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/cma_fe.c,v
retrieving revision 1.7
diff -u -r1.7 cma_fe.c
--- client/gui-xaw/cma_fe.c     26 Nov 2004 09:49:11 -0000      1.7
+++ client/gui-xaw/cma_fe.c     26 Nov 2004 22:11:36 -0000
@@ -489,7 +489,6 @@
   const struct cm_parameter *param;
   struct cm_parameter parameter;
   struct cm_result result;
-  int i;
 
   ret = XawListShowCurrent(list);
 
@@ -503,7 +502,7 @@
     }
 
     cmafec_get_fe_parameter(current_city, &parameter);
-    cm_copy_result_from_city(pcity, &result);
+    cm_copy_result_from_city(current_city, &result);
     xaw_set_label(result_label,
         (char *) cmafec_get_result_descr(current_city, &result, &parameter));
 
@@ -613,7 +612,7 @@
   }
 
   cmafec_get_fe_parameter(current_city, &parameter);
-  cm_copy_result_from_city(pcity, &result);
+  cm_copy_result_from_city(current_city, &result);
   xaw_set_label(result_label,
         (char *) cmafec_get_result_descr(current_city, &result, &parameter));
 
@@ -670,7 +669,7 @@
   }
 
   cmafec_get_fe_parameter(current_city, &parameter);
-  cm_copy_result_from_city(pcity, &result);
+  cm_copy_result_from_city(current_city, &result);
   xaw_set_label(result_label,
         (char *) cmafec_get_result_descr(current_city, &result, &parameter));
 
@@ -690,7 +689,6 @@
 static void update_stat_labels(bool is_valid)
 {
   char buf[256]; 
-  int i;
 
   output_type_iterate(i) {
     my_snprintf(buf, sizeof(buf), "%-9s%3d",
@@ -735,7 +733,6 @@
 {
   Boolean celebrate_setting;
   struct cm_parameter parameter;
-  int i;
   
   if (save_preset) {
     /* The user entered a preset name and clicked OK  */
@@ -765,7 +762,6 @@
   Boolean celebrate;
   struct cm_parameter parameter;
   struct cm_result result;
-  int i;
 
   /* Change label on celebrate toggle. */
   XtVaGetValues(w, XtNstate, &celebrate, NULL);
@@ -789,7 +785,7 @@
   }
 
   cmafec_get_fe_parameter(current_city, &parameter);
-  cm_copy_result_from_city(pcity, &result);
+  cm_copy_result_from_city(current_city, &result);
   xaw_set_label(result_label,
         (char *) cmafec_get_result_descr(current_city, &result, &parameter));