diff -u --recursive --exclude-from freeciv/diff_ignore freeciv.upstream/client/climisc.c freeciv/client/climisc.c
--- freeciv.upstream/client/climisc.c	Thu Apr 27 19:52:11 2000
+++ freeciv/client/climisc.c	Tue May  9 12:09:25 2000
@@ -192,7 +192,7 @@
   number 'new'.  Ie, renumber (x,y) tile and recursive adjacent
   known land tiles with the same previous continent ('old').
 **************************************************************************/
-static void climap_renumber_continent(int x, int y, int new)
+static void climap_renumber_continent(int x, int y, int nnew)
 {
   int i, j, old;
 
@@ -206,14 +206,14 @@
   assert(map_get_terrain(x,y) != T_OCEAN);
   assert(old>0 && old<=max_cont_used);
   
-  map_set_continent(x,y,new);
+  map_set_continent(x,y,nnew);
   for(i=x-1; i<=x+1; i++) {
     for(j=y-1; j<=y+1; j++) {
       if(!(i==x && j==y) && j>=0 && j<map.ysize
 	 && tile_is_known(i,j)>=TILE_KNOWN_FOGGED
 	 && map_get_terrain(i,j)!=T_OCEAN
 	 && map_get_continent(i,j)==old) {
-	climap_renumber_continent(i,j,new);
+	climap_renumber_continent(i,j,nnew);
       }
     }
   }
diff -u --recursive --exclude-from freeciv/diff_ignore freeciv.upstream/client/gui-gtk/citydlg.c freeciv/client/gui-gtk/citydlg.c
--- freeciv.upstream/client/gui-gtk/citydlg.c	Sun Apr 30 12:28:31 2000
+++ freeciv/client/gui-gtk/citydlg.c	Tue May  9 12:07:28 2000
@@ -2246,19 +2246,19 @@
 
   if (pcity) {
     struct packet_generic_values packet;
-    int i, new;
+    int i, nnew;
     
-    new = 0;
+    nnew = 0;
     for(i=0; i<NUM_CITYOPT_TOGGLES; i++)  {
-      if (GTK_TOGGLE_BUTTON(cityopt_toggles[i])->active) new |= (1<<i);
+      if (GTK_TOGGLE_BUTTON(cityopt_toggles[i])->active) nnew |= (1<<i);
     }
     if (ncitizen_idx == 1) {
-      new |= (1<<CITYO_NEW_EINSTEIN);
+      nnew |= (1<<CITYO_NEW_EINSTEIN);
     } else if (ncitizen_idx == 2) {
-      new |= (1<<CITYO_NEW_TAXMAN);
+      nnew |= (1<<CITYO_NEW_TAXMAN);
     }
     packet.value1 = cityopt_city_id;
-    packet.value2 = new;
+    packet.value2 = nnew;
     send_packet_generic_values(&aconnection, PACKET_CITY_OPTIONS,
 			      &packet);
   }
diff -u --recursive --exclude-from freeciv/diff_ignore freeciv.upstream/client/gui-gtk/gtkpixcomm.c freeciv/client/gui-gtk/gtkpixcomm.c
--- freeciv.upstream/client/gui-gtk/gtkpixcomm.c	Fri Jul 30 05:53:09 1999
+++ freeciv/client/gui-gtk/gtkpixcomm.c	Tue May  9 12:08:20 2000
@@ -69,13 +69,13 @@
 }
 
 static void
-gtk_pixcomm_class_init (GtkPixcommClass *class)
+gtk_pixcomm_class_init (GtkPixcommClass *cclass)
 {
   GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
+  object_class = (GtkObjectClass*) cclass;
+  widget_class = (GtkWidgetClass*) cclass;
   parent_class = gtk_type_class (GTK_TYPE_MISC);
 
   object_class->destroy = gtk_pixcomm_destroy;
diff -u --recursive --exclude-from freeciv/diff_ignore freeciv.upstream/client/gui-mui/citydlg.c freeciv/client/gui-mui/citydlg.c
--- freeciv.upstream/client/gui-mui/citydlg.c	Sun Apr 30 12:28:31 2000
+++ freeciv/client/gui-mui/citydlg.c	Tue May  9 12:31:14 2000
@@ -720,25 +720,25 @@
   if (pcity)
   {
     struct packet_generic_values packet;
-    int i, new, newcitizen_index = xget(pdialog->cityopt_cycle, MUIA_Cycle_Active);
+    int i, nnew, newcitizen_index = xget(pdialog->cityopt_cycle, MUIA_Cycle_Active);
 
-    new = 0;
+    nnew = 0;
     for (i = 0; i < NUM_CITYOPT_TOGGLES; i++)
     {
       if (xget(pdialog->cityopt_checks[i], MUIA_Selected))
-	new |= (1 << i);
+	nnew |= (1 << i);
     }
     if (newcitizen_index == 1)
     {
-      new |= (1 << CITYO_NEW_EINSTEIN);
+      nnew |= (1 << CITYO_NEW_EINSTEIN);
     }
     else if (newcitizen_index == 2)
     {
-      new |= (1 << CITYO_NEW_TAXMAN);
+      nnew |= (1 << CITYO_NEW_TAXMAN);
     }
 
     packet.value1 = pcity->id;
-    packet.value2 = new;
+    packet.value2 = nnew;
     send_packet_generic_values(&aconnection, PACKET_CITY_OPTIONS,
 			       &packet);
   }
diff -u --recursive --exclude-from freeciv/diff_ignore freeciv.upstream/client/gui-xaw/citydlg.c freeciv/client/gui-xaw/citydlg.c
--- freeciv.upstream/client/gui-xaw/citydlg.c	Thu Apr 27 19:52:14 2000
+++ freeciv/client/gui-xaw/citydlg.c	Tue May  9 12:30:17 2000
@@ -2737,21 +2737,21 @@
 
   if (pcity) {
     struct packet_generic_values packet;
-    int i, new;
+    int i, nnew;
     Boolean b;
     
-    new = 0;
+    nnew = 0;
     for(i=0; i<NUM_CITYOPT_TOGGLES; i++)  {
       XtVaGetValues(cityopt_toggles[i], XtNstate, &b, NULL);
-      if (b) new |= (1<<i);
+      if (b) nnew |= (1<<i);
     }
     if (newcitizen_index == 1) {
-      new |= (1<<CITYO_NEW_EINSTEIN);
+      nnew |= (1<<CITYO_NEW_EINSTEIN);
     } else if (newcitizen_index == 2) {
-      new |= (1<<CITYO_NEW_TAXMAN);
+      nnew |= (1<<CITYO_NEW_TAXMAN);
     }
     packet.value1 = cityopt_city_id;
-    packet.value2 = new;
+    packet.value2 = nnew;
     send_packet_generic_values(&aconnection, PACKET_CITY_OPTIONS,
 			       &packet);
   }
diff -u --recursive --exclude-from freeciv/diff_ignore freeciv.upstream/client/tilespec.c freeciv/client/tilespec.c
--- freeciv.upstream/client/tilespec.c	Sun Apr 30 12:28:30 2000
+++ freeciv/client/tilespec.c	Tue May  9 12:10:37 2000
@@ -671,11 +671,11 @@
 ***********************************************************************/
 void tilespec_setup_nation_flag(int id)
 {
-  struct nation_type *this = get_nation_by_idx(id);
+  struct nation_type *tthis = get_nation_by_idx(id);
 
-  this->flag_sprite = lookup_sprite_tag_alt(this->flag_graphic_str, 
-					    this->flag_graphic_alt,
-					    1, "nation", this->name);
+  tthis->flag_sprite = lookup_sprite_tag_alt(tthis->flag_graphic_str, 
+					    tthis->flag_graphic_alt,
+					    1, "nation", tthis->name);
 
   /* should probably do something if NULL, eg generic default? */
 }