summaryrefslogtreecommitdiff
path: root/src/wc.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-12-23 19:06:31 +0100
committerJim Meyering <meyering@redhat.com>2009-01-01 02:15:07 +0100
commit92465d59c678c5a8e8c4c0985eb6ecec4c391df9 (patch)
tree5f79e5a63b435fa4d8260bc7a82ca2376ad25c1c /src/wc.c
parent921feefb12e7f93c0925188b9b11f2e1fd775e33 (diff)
downloadcoreutils-92465d59c678c5a8e8c4c0985eb6ecec4c391df9.tar.xz
cleanup/modernize: don't test HAVE_MBRTOWC; now gnulib provides it
* bootstrap.conf (gnulib_modules): Include mbrtowc explicitly. * src/ls.c (quote_name): Don't test HAVE_MBRTOWC, now that we're guaranteed to have the function. * src/wc.c (wc): Likewise.
Diffstat (limited to 'src/wc.c')
-rw-r--r--src/wc.c4
1 files changed, 2 insertions, 2 deletions
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)
{