Index: utility/distribute.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/utility/distribute.c,v retrieving revision 1.1 diff -u -r1.1 distribute.c --- utility/distribute.c 27 Aug 2004 08:18:38 -0000 1.1 +++ utility/distribute.c 6 Mar 2005 17:25:36 -0000 @@ -33,7 +33,9 @@ void distribute(int number, int groups, int *ratios, int *result) { int i, sum = 0, rest[groups], max_groups[groups], max_count, max; +#ifndef NDEBUG const int original_number = number; +#endif /* * Distribution of a number of items into a number of groups with a given Index: ai/aicity.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/ai/aicity.c,v retrieving revision 1.199 diff -u -r1.199 aicity.c --- ai/aicity.c 6 Mar 2005 17:14:41 -0000 1.199 +++ ai/aicity.c 6 Mar 2005 17:25:37 -0000 @@ -181,7 +181,6 @@ { struct ai_data *ai = ai_data_get(pplayer); int final_want = 0; - struct city *capital = find_palace(pplayer); int great_wonders_tmp = 0, small_wonders_tmp = 0; if (ai->impr_calc[id] == AI_IMPR_ESTIMATE) { @@ -215,9 +214,6 @@ pplayer->small_wonders[id] = small_wonders_tmp; } - /* Ensure that we didn't inadvertantly move our palace */ - assert(find_palace(pplayer) == capital); - return final_want; } Index: client/gui-gtk-2.0/menu.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/menu.c,v retrieving revision 1.65 diff -u -r1.65 menu.c --- client/gui-gtk-2.0/menu.c 12 Feb 2005 17:51:53 -0000 1.65 +++ client/gui-gtk-2.0/menu.c 6 Mar 2005 17:25:37 -0000 @@ -1160,7 +1160,9 @@ { Terrain_type_id old_terrain = ptile->terrain; enum tile_special_type old_special = ptile->special; +#ifndef NDEBUG struct tile_type *ptype = get_tile_type(ptile->terrain); +#endif const char *text; /* Change the terrain manually to avoid any side effects. */