summaryrefslogtreecommitdiff
path: root/src/ls.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/ls.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/ls.c')
-rw-r--r--src/ls.c4
1 files changed, 0 insertions, 4 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;