- mbswidth change to avoid empty translation unit warnings

diff --git a/mbswidth.c b/mbswidth.c
index a38d03ecce0b1d75e37cd06c3a2602ad5c241b18..21622057c860ced19c3ba4d6765be2eb3a59e2b7 100644 (file)
--- a/mbswidth.c
+++ b/mbswidth.c
@@ -24,11 +24,11 @@
 # include <config.h>
 #endif
 
-#ifdef HANDLE_MULTIBYTE /* for abook */
-
 /* Specification.  */
 #include "mbswidth.h"
 
+#ifdef HANDLE_MULTIBYTE /* for abook */
+
 /* Get MB_CUR_MAX.  */
 #include <stdlib.h>
 
@@ -326,4 +326,13 @@ mbsnbytes (const char *string, size_t nbytes, int maxwidth, int flags)
   return maxwidth;
 }
 
+#else /* HANDLE_MULTIBYTE */
+
+#include <string.h>
+int
+mbswidth (const char *string, int flags)
+{
+  return strlen(string);
+}
 #endif /* HANDLE_MULTIBYTE */
+

diff --git a/misc.c b/misc.c
index 9a603dbf68a6341692fee646b358bc517f225f7d..90f41aca3b413b024a6091d79823a5e2db047016 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -18,9 +18,7 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#ifdef HANDLE_MULTIBYTE
-#      include <mbswidth.h>
-#endif
+#include <mbswidth.h>
 #include "misc.h"
 #include "xmalloc.h"
 
@@ -274,11 +272,7 @@ int
 strwidth(const char *s)
 {
        assert(s);
-#ifdef HANDLE_MULTIBYTE
-       return (int)mbswidth(s, 0);
-#else
-       return strlen(s);
-#endif
+       return mbswidth(s, 0);
 }
 
 int