>From 91b5a3c3e365de748d740e6a55d7b4ee7713eeef Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 22 Dec 2019 10:06:04 +0100
Subject: [PATCH 11/15] atoll: Assume that the compiler supports 'long long'.

* m4/atoll.m4 (gl_FUNC_ATOLL): Don't require AC_TYPE_LONG_LONG_INT.
* modules/atoll (Files): Remove longlong.m4.
---
 ChangeLog     |  4 ++++
 m4/atoll.m4   | 13 ++++---------
 modules/atoll |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f053f6..fa580b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-12-22  Bruno Haible  <address@hidden>
 
+	atoll: Assume that the compiler supports 'long long'.
+	* m4/atoll.m4 (gl_FUNC_ATOLL): Don't require AC_TYPE_LONG_LONG_INT.
+	* modules/atoll (Files): Remove longlong.m4.
+
 	strtoll: Assume that the compiler supports 'long long'.
 	* m4/strtoll.m4 (gl_FUNC_STRTOLL): Don't require AC_TYPE_LONG_LONG_INT.
 	* modules/strtoll (Files): Remove longlong.m4.
diff --git a/m4/atoll.m4 b/m4/atoll.m4
index c126d18..018aded 100644
--- a/m4/atoll.m4
+++ b/m4/atoll.m4
@@ -1,4 +1,4 @@
-# atoll.m4 serial 2
+# atoll.m4 serial 3
 dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,14 +7,9 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_ATOLL],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  dnl We don't need (and can't compile) the replacement strtoll
-  dnl unless the type 'long long int' exists.
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-  if test "$ac_cv_type_long_long_int" = yes; then
-    AC_CHECK_FUNCS([atoll])
-    if test $ac_cv_func_atoll = no; then
-      HAVE_ATOLL=0
-    fi
+  AC_CHECK_FUNCS([atoll])
+  if test $ac_cv_func_atoll = no; then
+    HAVE_ATOLL=0
   fi
 ])
 
diff --git a/modules/atoll b/modules/atoll
index 35f6e04..69cda85 100644
--- a/modules/atoll
+++ b/modules/atoll
@@ -4,7 +4,6 @@ atoll() function: convert decimal string to 'long long'.
 Files:
 lib/atoll.c
 m4/atoll.m4
-m4/longlong.m4
 
 Depends-on:
 strtoll         [test $HAVE_ATOLL = 0]
-- 
2.7.4