summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ls.c4
-rw-r--r--src/wc.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ls.c b/src/ls.c
index 008186595..b03aebc1f 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -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;
diff --git a/src/wc.c b/src/wc.c
index 65368f994..b1afe1495 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -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)
{