>From c4b2df3e3a859ac2eebc3f1685bdc6ff3d4c3ba3 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Thu, 6 Sep 2018 14:46:06 +0200
Subject: [PATCH 2/5] 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'.
---
 ChangeLog        |  8 ++++++++
 lib/xstrtol.c    | 14 --------------
 modules/xstrtol  |  1 -
 modules/xstrtoll |  1 +
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4116600..6eb3027 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2018-09-06  Bruno Haible  <address@hidden>
 
+	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  <address@hidden>
+
 	strtoll, strtoull: Rely on limits-h module.
 	* lib/strtol.c (TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Remove macros.
 	(ULLONG_MAX, LLONG_MAX, LLONG_MIN): Remove fallback definitions.
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index d8b4edb..1332e3f 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -41,20 +41,6 @@
 #include <string.h>
 
 #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 <limits.h> 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 9c89aef..26240ec 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 a5da211..ee5fa8e 100644
--- a/modules/xstrtoll
+++ b/modules/xstrtoll
@@ -6,6 +6,7 @@ lib/xstrtoll.c
 lib/xstrtoull.c
 
 Depends-on:
+limits-h
 strtoll
 strtoull
 xstrtol
-- 
2.7.4