--- freeciv.upstream/server/ruleset.c	Mon May  8 10:57:42 2000
+++ freeciv/server/ruleset.c	Tue May  9 11:44:34 2000
@@ -48,7 +48,7 @@
 		       char *description);
 static char *lookup_helptext(struct section_file *file, char *prefix);
 
-static enum tile_terrain_type lookup_terrain(char *name, int this);
+static enum tile_terrain_type lookup_terrain(char *name, int tthis);
 
 static void load_ruleset_techs(char *ruleset_subdir);
 static void load_ruleset_units(char *ruleset_subdir);
@@ -334,7 +334,7 @@
 /**************************************************************************
  Lookup a terrain name in the tile_types array; return its index.
 **************************************************************************/
-static enum tile_terrain_type lookup_terrain(char *name, int this)
+static enum tile_terrain_type lookup_terrain(char *name, int tthis)
 {
   int i;
 
@@ -344,7 +344,7 @@
     }
   else if (0 == strcmp(name, "yes"))
     {
-      return (this);
+      return (tthis);
     }
 
   for (i = T_FIRST; i < T_COUNT; i++)
--- freeciv.upstream/server/unitfunc.c	Tue May  9 11:12:44 2000
+++ freeciv/server/unitfunc.cpp	Tue May  9 11:46:50 2000
@@ -1830,14 +1830,14 @@
 static void check_terrain_ocean_land_change(int x, int y,
 					    enum tile_terrain_type old)
 {
-  enum tile_terrain_type new = map_get_terrain(x, y);
+  enum tile_terrain_type nnew = map_get_terrain(x, y);
 
-  if ((old == T_OCEAN) && (new != T_OCEAN)) {
+  if ((old == T_OCEAN) && (nnew != T_OCEAN)) {
     /* ocean to land ... */
     city_landlocked_sell_coastal_improvements(x, y);
     assign_continent_numbers();
     gamelog(GAMELOG_MAP, "(%d,%d) land created from ocean", x, y);
-  } else if ((old != T_OCEAN) && (new == T_OCEAN)) {
+  } else if ((old != T_OCEAN) && (nnew == T_OCEAN)) {
     /* land to ocean ... */
     assign_continent_numbers();
     gamelog(GAMELOG_MAP, "(%d,%d) ocean created from land", x, y);