diff -urN -Xfreeciv/diff_ignore freeciv/client/agents/cma_core.c freeciv-cmdlevel/client/agents/cma_core.c
--- freeciv/client/agents/cma_core.c	Sun Sep 29 20:56:54 2002
+++ freeciv-cmdlevel/client/agents/cma_core.c	Mon Oct 14 21:54:39 2002
@@ -2002,7 +2002,7 @@
 /****************************************************************************
 ...
 *****************************************************************************/
-const char *const cma_get_stat_name(enum stat stat)
+const char *const cma_get_stat_name(enum cma_stat stat)
 {
   switch (stat) {
   case FOOD:
diff -urN -Xfreeciv/diff_ignore freeciv/client/agents/cma_core.h freeciv-cmdlevel/client/agents/cma_core.h
--- freeciv/client/agents/cma_core.h	Sat Sep 28 03:36:21 2002
+++ freeciv-cmdlevel/client/agents/cma_core.h	Mon Oct 14 21:54:25 2002
@@ -36,7 +36,7 @@
   FT_EXTRA			/* will use (minimal_surplus-surplus) as base */
 };
 
-enum stat { FOOD, SHIELD, TRADE, GOLD, LUXURY, SCIENCE, NUM_STATS };
+enum cma_stat { FOOD, SHIELD, TRADE, GOLD, LUXURY, SCIENCE, NUM_STATS };
 
 /* A description of the goal. */
 struct cma_parameter {
@@ -96,7 +96,7 @@
 			    struct cma_parameter *parameter);
 
 /***************** utility methods *************************************/
-const char *const cma_get_stat_name(enum stat stat);
+const char *const cma_get_stat_name(enum cma_stat stat);
 bool cma_are_parameter_equal(const struct cma_parameter *const p1,
 			    const struct cma_parameter *const p2);
 void cma_copy_parameter(struct cma_parameter *dest,