diff options
| -rw-r--r-- | bootstrap.conf | 5 | ||||
| -rw-r--r-- | src/ls.c | 4 | ||||
| -rw-r--r-- | src/wc.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 2fa7f0d30..203a80caf 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -66,7 +66,10 @@ gnulib_modules=" ignore-value inttostr inttypes isapipe lchmod lchown lib-ignore linebuffer link-follow - long-options lstat malloc mbswidth memcasecmp mempcpy + long-options lstat malloc + mbrtowc + mbswidth + memcasecmp mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkstemp mktime modechange mountlist mpsort obstack pathmax perl physmem @@ -3681,7 +3681,6 @@ quote_name (FILE *out, const char *name, struct quoting_options const *options, if (qmark_funny_chars) { -#if HAVE_MBRTOWC if (MB_CUR_MAX > 1) { char const *p = buf; @@ -3784,7 +3783,6 @@ quote_name (FILE *out, const char *name, struct quoting_options const *options, len = q - buf; } else -#endif { char *p = buf; char const *plimit = buf + len; @@ -3800,11 +3798,9 @@ quote_name (FILE *out, const char *name, struct quoting_options const *options, } else if (width != NULL) { -#if HAVE_MBRTOWC if (MB_CUR_MAX > 1) displayed_width = mbsnwidth (buf, len, 0); else -#endif { char const *p = buf; char const *plimit = buf + len; @@ -196,7 +196,7 @@ wc (int fd, char const *file_x, struct fstatus *fstatus) /* If in the current locale, chars are equivalent to bytes, we prefer counting bytes, because that's easier. */ -#if HAVE_MBRTOWC && (MB_LEN_MAX > 1) +#if MB_LEN_MAX > 1 if (MB_CUR_MAX > 1) { count_bytes = print_bytes; @@ -272,7 +272,7 @@ wc (int fd, char const *file_x, struct fstatus *fstatus) bytes += bytes_read; } } -#if HAVE_MBRTOWC && (MB_LEN_MAX > 1) +#if MB_LEN_MAX > 1 # define SUPPORT_OLD_MBRTOWC 1 else if (MB_CUR_MAX > 1) { |