diff -X freeciv/diff_ignore -Nurd freeciv/client/gui-gtk/mapview.c freeciv.1/client/gui-gtk/mapview.c
--- freeciv/client/gui-gtk/mapview.c	Tue Feb  6 21:30:59 2001
+++ freeciv.1/client/gui-gtk/mapview.c	Wed Feb 14 17:13:09 2001
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #endif
 
-#include <assert.h>
 #include <gtk/gtk.h>
 
 #include <gdk_imlib.h>
@@ -109,7 +108,6 @@
 static void put_overlay_tile_gpixmap(GtkPixcomm *pixmap,
 				     int canvas_x, int canvas_y,
 				     struct Sprite *ssprite);
-static void show_city_descriptions(void);
 static void put_unit_pixmap(struct unit *punit, GdkPixmap *pm,
 			    int canvas_x, int canvas_y);
 static void put_line(GdkDrawable *pm, int canvas_src_x, int canvas_src_y, int dir);
diff -X freeciv/diff_ignore -Nurd freeciv/client/gui-xaw/mapctrl.h freeciv.1/client/gui-xaw/mapctrl.h
--- freeciv/client/gui-xaw/mapctrl.h	Wed Jan 31 00:38:54 2001
+++ freeciv.1/client/gui-xaw/mapctrl.h	Wed Feb 14 17:20:59 2001
@@ -31,6 +31,5 @@
 void update_line(int window_x, int window_y);
 
 extern int city_workers_color;
-extern struct city *city_workers_display;
 
 #endif  /* FC__MAPCTRL_H */
Binary files freeciv/client/gui-xaw/stAI6ms5 and freeciv.1/client/gui-xaw/stAI6ms5 differ
diff -X freeciv/diff_ignore -Nurd freeciv/common/support.c freeciv.1/common/support.c
--- freeciv/common/support.c	Sun Sep  3 05:18:17 2000
+++ freeciv.1/common/support.c	Wed Feb 14 16:51:10 2001
@@ -285,7 +285,7 @@
   int ret;
 
   ret = test_snprintf(buf, ntrunc, "%s", test_str);
-#if DEBUG
+#ifdef DEBUG
   if (buf[ntrunc] != one_past) {
     fprintf(stderr, "debug: test_snprintf wrote past n\n");
   } else if (buf[ntrunc-1] != '\0') {