Cleaned up test-utf8-body a bit.

[mmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 7eef85f..3d66bcf 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -58,7 +58,11 @@ char *scanl = 0;                     /* text of most recent scanline    */
  */
 static int mh_fputs(char *, FILE *);
 
+#ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
+#else
+#define SCAN_CHARWIDTH 1
+#endif
 
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
@@ -357,19 +361,6 @@ finished:
 }
 
 
-/*
- * Cheat:  we are loaded with adrparse, which wants a routine called
- * OfficialName().  We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called.  Hence, the following
- * is to keep the loader happy.
- */
-char *
-OfficialName (char *name)
-{
-    return name;
-}
-
-
 static int
 mh_fputs(char *s, FILE *stream)
 {