>From 0b018e2c609fd49ccce27d55225e145d5c982819 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 22 Dec 2019 10:04:37 +0100
Subject: [PATCH 10/15] 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.
---
 ChangeLog       |  4 ++++
 m4/strtoll.m4   | 13 ++++---------
 modules/strtoll |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5775d5f..2f053f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-12-22  Bruno Haible  <address@hidden>
 
+	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.
+
 	strtoull: Assume that the compiler supports 'long long'.
 	* m4/strtoull.m4 (gl_FUNC_STRTOULL): Don't require
 	AC_TYPE_UNSIGNED_LONG_LONG_INT.
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 3ba7e22..8018ffe 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,4 +1,4 @@
-# strtoll.m4 serial 7
+# strtoll.m4 serial 8
 dnl Copyright (C) 2002, 2004, 2006, 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_STRTOLL],
 [
   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([strtoll])
-    if test $ac_cv_func_strtoll = no; then
-      HAVE_STRTOLL=0
-    fi
+  AC_CHECK_FUNCS([strtoll])
+  if test $ac_cv_func_strtoll = no; then
+    HAVE_STRTOLL=0
   fi
 ])
 
diff --git a/modules/strtoll b/modules/strtoll
index 082d7f4..7b6d80c 100644
--- a/modules/strtoll
+++ b/modules/strtoll
@@ -4,7 +4,6 @@ strtoll() function: convert string to 'long long'.
 Files:
 lib/strtol.c
 lib/strtoll.c
-m4/longlong.m4
 m4/strtoll.m4
 
 Depends-on:
-- 
2.7.4