#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#ifdef HANDLE_MULTIBYTE
-# include <mbswidth.h>
-#endif
+#include <mbswidth.h>
#include "misc.h"
#include "xmalloc.h"
#endif
char *
-mkstr (const char *format, ... )
+strdup_printf (const char *format, ... )
{
MY_VA_LOCAL_DECL;
size_t size = 100;
strwidth(const char *s)
{
assert(s);
-#ifdef HANDLE_MULTIBYTE
- return (int)mbswidth(s, 0);
-#else
- return strlen(s);
-#endif
+ return mbswidth(s, 0);
}
int