diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/ai/aiunit.c freeciv/ai/aiunit.c
--- FreecivCVS/ai/aiunit.c	Mon Feb 14 08:52:28 2000
+++ freeciv/ai/aiunit.c	Sat Feb 26 10:31:55 2000
@@ -1732,7 +1732,6 @@
     return;
   }
   /* should never get here */
-  freelog(LOG_DEBUG, "Error: At end of ai_manage_unit().");
 }
 
 /**************************************************************************
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/dialogs.c freeciv/client/gui-xaw/dialogs.c
--- FreecivCVS/client/gui-xaw/dialogs.c	Sat Feb 19 00:15:47 2000
+++ freeciv/client/gui-xaw/dialogs.c	Sat Feb 26 10:37:46 2000
@@ -1450,8 +1450,8 @@
 
   i=0;
   va_start(args, text);
-  
-  while((fcb=va_arg(args, void *))) {
+
+  while((fcb=((void(*)(Widget, XtPointer, XtPointer))(va_arg(args, void *))))) {
     client_data=va_arg(args, XtPointer);
     fixed_width=va_arg(args, int);
     my_snprintf(button_name, sizeof(button_name), "button%d", i++);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/wldlg.c freeciv/client/gui-xaw/wldlg.c
--- FreecivCVS/client/gui-xaw/wldlg.c	Thu Feb 10 09:43:33 2000
+++ freeciv/client/gui-xaw/wldlg.c	Sat Feb 26 10:30:33 2000
@@ -530,7 +530,8 @@
 
   /* Fill in the list of available build targets,
      and set correct label in show-advanced toggle. */
-  worklist_show_advanced_callback(pdialog->toggle_show_advanced, pdialog, NULL);
+  worklist_show_advanced_callback(pdialog->toggle_show_advanced,
+				  (XtPointer)pdialog, NULL);
 
   /* force refresh of viewport so the scrollbar is added.
    * Buggy sun athena requires this */
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/include/freeciv.ico freeciv/client/include/freeciv.ico
--- FreecivCVS/client/include/freeciv.ico	Fri Feb 18 23:00:53 2000
+++ freeciv/client/include/freeciv.ico	Sat Feb 26 10:24:19 2000
@@ -1,6 +1,6 @@
 #define freeciv_width 40
 #define freeciv_height 40
-static char freeciv_bits[] = {
+static unsigned char freeciv_bits[] = {
  0x00,0x80,0xff,0x01,0x00,0x00,0xf0,0xd7,0x0f,0x00,0x00,0xbc,0x54,0x3e,0x00,
  0x00,0x4a,0x92,0x54,0x00,0x80,0x25,0x92,0xa8,0x01,0x40,0x22,0x92,0x48,0x02,
  0x20,0x11,0x11,0x91,0x04,0x90,0x08,0x11,0x21,0x09,0x90,0x08,0x11,0x21,0x09,