>From 04ac8d921179273cd438cfb4c6eb0c039f4ee076 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 22 Dec 2019 10:03:30 +0100
Subject: [PATCH 09/15] strtoull: Assume that the compiler supports 'long
 long'.

* m4/strtoull.m4 (gl_FUNC_STRTOULL): Don't require
AC_TYPE_UNSIGNED_LONG_LONG_INT.
* modules/strtoull (Files): Remove longlong.m4.
---
 ChangeLog        |  5 +++++
 m4/strtoull.m4   | 13 ++++---------
 modules/strtoull |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5b304b..5775d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2019-12-22  Bruno Haible  <address@hidden>
 
+	strtoull: Assume that the compiler supports 'long long'.
+	* m4/strtoull.m4 (gl_FUNC_STRTOULL): Don't require
+	AC_TYPE_UNSIGNED_LONG_LONG_INT.
+	* modules/strtoull (Files): Remove longlong.m4.
+
 	strtoimax, strtoumax: Assume that the compiler supports 'long long'.
 	* lib/strtoimax.c: Assume HAVE_LONG_LONG_INT and
 	HAVE_UNSIGNED_LONG_LONG_INT to be 1.
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index 532139c..6cc83d2 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,4 +1,4 @@
-# strtoull.m4 serial 7
+# strtoull.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_STRTOULL],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  dnl We don't need (and can't compile) the replacement strtoull
-  dnl unless the type 'unsigned long long int' exists.
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-    AC_CHECK_FUNCS([strtoull])
-    if test $ac_cv_func_strtoull = no; then
-      HAVE_STRTOULL=0
-    fi
+  AC_CHECK_FUNCS([strtoull])
+  if test $ac_cv_func_strtoull = no; then
+    HAVE_STRTOULL=0
   fi
 ])
 
diff --git a/modules/strtoull b/modules/strtoull
index 7f94bca..ff83b69 100644
--- a/modules/strtoull
+++ b/modules/strtoull
@@ -5,7 +5,6 @@ Files:
 lib/strtol.c
 lib/strtoul.c
 lib/strtoull.c
-m4/longlong.m4
 m4/strtoull.m4
 
 Depends-on:
-- 
2.7.4