From 5377e375dd6e933437bac066cd86ea54880f3f73 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 Dec 2019 09:57:17 +0100
Subject: [PATCH] xstrtoll: Assume that the compiler supports 'long long'.

* lib/xstrtol.h (xstrtoll, xstrtoull): Declare unconditionally.
* modules/xstrtoll (configure.ac): Don't invoke AC_TYPE_LONG_LONG_INT.
---
 ChangeLog        | 4 ++++
 lib/xstrtol.h    | 7 ++-----
 modules/xstrtoll | 4 ----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf96d6c5c2..e295186332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-12-22  Bruno Haible  <bruno@clisp.org>
 
+	xstrtoll: Assume that the compiler supports 'long long'.
+	* lib/xstrtol.h (xstrtoll, xstrtoull): Declare unconditionally.
+	* modules/xstrtoll (configure.ac): Don't invoke AC_TYPE_LONG_LONG_INT.
+
 	vasnprintf: Assume that the compiler supports 'long long'.
 	* lib/printf-args.h: Assume HAVE_LONG_LONG_INT to be 1.
 	* lib/printf-args.c (PRINTF_FETCHARGS): Likewise.
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index d888120e6b..ea92f1b715 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -42,12 +42,9 @@ typedef enum strtol_error strtol_error;
   strtol_error name (const char *, char **, int, type *, const char *);
 _DECLARE_XSTRTOL (xstrtol, long int)
 _DECLARE_XSTRTOL (xstrtoul, unsigned long int)
-_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
-_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
-
-#if HAVE_LONG_LONG_INT
 _DECLARE_XSTRTOL (xstrtoll, long long int)
 _DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
-#endif
+_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
+_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
 
 #endif /* not XSTRTOL_H_ */
diff --git a/modules/xstrtoll b/modules/xstrtoll
index ee5fa8efcf..ccff7f1acc 100644
--- a/modules/xstrtoll
+++ b/modules/xstrtoll
@@ -14,10 +14,6 @@ xstrtol
 configure.ac:
 AC_LIBOBJ([xstrtoll])
 AC_LIBOBJ([xstrtoull])
-AC_TYPE_LONG_LONG_INT
-test $ac_cv_type_long_long_int = no \
-  && AC_MSG_ERROR(
-      [you lack long long support; required by gnulib's xstrtoll module])
 
 Makefile.am:
 
-- 
2.39.5