summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2004-12-02 06:52:10 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2004-12-02 06:52:10 +0000
commit08da1bb43939bec84627f63b30ab63632c7f8c7f (patch)
treebc3560b0ddb7c8e9227206fec7b433a5a3153c78 /lib
parent2dea4ec8b08df6b15c4ee19bd27a544a0aa9af53 (diff)
downloadcoreutils-08da1bb43939bec84627f63b30ab63632c7f8c7f.tar.xz
Assume <locale.h> exists.
(human_readable): Assume localeconv exists.
Diffstat (limited to 'lib')
-rw-r--r--lib/human.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/human.c b/lib/human.c
index 4960876dd..295e6de3c 100644
--- a/lib/human.c
+++ b/lib/human.c
@@ -32,10 +32,7 @@
# define UINTMAX_MAX ((uintmax_t) -1)
#endif
-#if HAVE_LOCALE_H && HAVE_LOCALECONV
-# include <locale.h>
-#endif
-
+#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -193,7 +190,6 @@ human_readable (uintmax_t n, char *buf, int opts,
size_t decimal_pointlen = 1;
char const *grouping = "";
char const *thousands_sep = "";
-#if HAVE_LOCALE_H && HAVE_LOCALECONV
struct lconv const *l = localeconv ();
size_t pointlen = strlen (l->decimal_point);
if (0 < pointlen && pointlen <= MB_LEN_MAX)
@@ -204,7 +200,6 @@ human_readable (uintmax_t n, char *buf, int opts,
grouping = l->grouping;
if (strlen (l->thousands_sep) <= MB_LEN_MAX)
thousands_sep = l->thousands_sep;
-#endif
psuffix = buf + LONGEST_HUMAN_READABLE - HUMAN_READABLE_SUFFIX_LENGTH_MAX;
p = psuffix;