From: Bruno Haible Date: Thu, 6 Sep 2018 12:46:06 +0000 (+0200) Subject: xstrtoll: Rely on limits-h module. X-Git-Tag: v1.0~5442 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c4b2df3e3a859ac2eebc3f1685bdc6ff3d4c3ba3;p=gnulib.git xstrtoll: Rely on limits-h module. * lib/xstrtol.c: Don't include intprops.h. (ULLONG_MAX, LLONG_MAX, LLONG_MIN): Remove fallback definitions. * modules/xstrtol (Depends-on): Remove 'intprops'. * modules/xstrtoll (Depends-on): Add 'limits-h'. --- diff --git a/ChangeLog b/ChangeLog index 4116600e5e..6eb30276df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-09-06 Bruno Haible + + xstrtoll: Rely on limits-h module. + * lib/xstrtol.c: Don't include intprops.h. + (ULLONG_MAX, LLONG_MAX, LLONG_MIN): Remove fallback definitions. + * modules/xstrtol (Depends-on): Remove 'intprops'. + * modules/xstrtoll (Depends-on): Add 'limits-h'. + 2018-09-06 Bruno Haible strtoll, strtoull: Rely on limits-h module. diff --git a/lib/xstrtol.c b/lib/xstrtol.c index d8b4edb8a9..1332e3fc25 100644 --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -41,20 +41,6 @@ #include #include "assure.h" -#include "intprops.h" - -/* xstrtoll.c and xstrtoull.c, which include this file, require that - ULLONG_MAX, LLONG_MAX, LLONG_MIN are defined, but does not - define them on all platforms. */ -#ifndef ULLONG_MAX -# define ULLONG_MAX TYPE_MAXIMUM (unsigned long long) -#endif -#ifndef LLONG_MAX -# define LLONG_MAX TYPE_MAXIMUM (long long int) -#endif -#ifndef LLONG_MIN -# define LLONG_MIN TYPE_MINIMUM (long long int) -#endif static strtol_error bkm_scale (__strtol_t *x, int scale_factor) diff --git a/modules/xstrtol b/modules/xstrtol index 9c89aef089..26240ecc99 100644 --- a/modules/xstrtol +++ b/modules/xstrtol @@ -14,7 +14,6 @@ exitfail error getopt-gnu gettext-h -intprops inttypes-incomplete configure.ac: diff --git a/modules/xstrtoll b/modules/xstrtoll index a5da21148d..ee5fa8efcf 100644 --- a/modules/xstrtoll +++ b/modules/xstrtoll @@ -6,6 +6,7 @@ lib/xstrtoll.c lib/xstrtoull.c Depends-on: +limits-h strtoll strtoull xstrtol