summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--m4/atoll.m413
-rw-r--r--modules/atoll1
3 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f053f67d3..fa580b51c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2019-12-22 Bruno Haible <bruno@clisp.org>
+ 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 c126d1853b..018aded5da 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 35f6e045c2..69cda85117 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]