summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-10-15 07:26:01 +0000
committerJim Meyering <jim@meyering.net>2003-10-15 07:26:01 +0000
commit7edceab01c96c3847b7f22f70357ab8418c2e8dc (patch)
tree48b6bfd52d25ecc63614edb46a9d5d94ca1535cb /lib
parent3cb9191034c3f8142eee69174a22bc6ba69a066f (diff)
downloadcoreutils-7edceab01c96c3847b7f22f70357ab8418c2e8dc.tar.xz
Sync with gnulib.
Diffstat (limited to 'lib')
-rw-r--r--lib/human.c2
-rw-r--r--lib/xstrtoimax.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/human.c b/lib/human.c
index b342bf178..36cfd7348 100644
--- a/lib/human.c
+++ b/lib/human.c
@@ -450,8 +450,6 @@ humblock (char const *spec, uintmax_t *block_size, int *options)
"eEgGkKmMpPtTyYzZ0");
if (e != LONGINT_OK)
return e;
- if (*ptr)
- return LONGINT_INVALID_SUFFIX_CHAR;
for (; ! ('0' <= *spec && *spec <= '9'); spec++)
if (spec == ptr)
{
diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index 94c657786..2ba136772 100644
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -30,4 +30,8 @@
#define __strtol strtoimax
#define __strtol_t intmax_t
#define __xstrtol xstrtoimax
+#ifdef INTMAX_MAX
+# define STRTOL_T_MINIMUM INTMAX_MIN
+# define STRTOL_T_MAXIMUM INTMAX_MAX
+#endif
#include "xstrtol.c"