--- xc/programs/xfs/os/config.c.orig	2005-04-26 03:13:52.000000000 -0600
+++ xc/programs/xfs/os/config.c	2005-04-26 03:14:09.000000000 -0600
@@ -665,6 +665,8 @@
     val = config_parse_int (val, &ret, &scan);
     if (ret == -1)
 	return val;
+#ifdef SNFFORMAT
     SnfSetFormat (bit, byte, glyph, scan);
+#endif
     return val;
 }
--- xc/fonts/util/ucs2any.c	2004-03-04 17:46:21.000000000 +0000
+++ xc/fonts/util/ucs2any.c	2004-09-11 12:49:37.000000000 +0000
@@ -61,17 +61,6 @@
 /* global variable for argv[0] */
 const char *my_name = NULL;
 
-#ifdef NEED_BASENAME
-static char *
-basename(char *pathname)
-{
-	char	*ptr;
-
-	ptr = strrchr(pathname, '/');
-	return ((ptr == NULL) ? pathname : &ptr[1]);
-}
-#endif
-
 /* "CLASS" "z" string and memory manipulation */
 
 static void *