Sync with gnulib.

diff --git a/lib/human.c b/lib/human.c
index b342bf178445d2d4f68ad51999ab579be98df988..36cfd7348876047fce07f7d0926eefb82ce278ef 100644 (file)
--- 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 94c65778641025587f652b76f5a2262f315cd7ce..2ba136772c861ccd1671e7bef2e5043a444369dd 100644 (file)
--- 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"