summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2008-10-19 18:42:31 +0200
committerBruno Haible <bruno@clisp.org>2008-10-19 18:42:31 +0200
commit6688506d40c960504c892d8f394beaafc01cf007 (patch)
tree5feca60303bb2f97b27470e74ec5d25faa273a5c /m4
parent242151248bec690cd3416680abf094995856c104 (diff)
downloadgnulib-6688506d40c960504c892d8f394beaafc01cf007.tar.gz
Add strtoll() declaration to <stdlib.h>.
Diffstat (limited to 'm4')
-rw-r--r--m4/stdlib_h.m44
-rw-r--r--m4/strtoll.m46
2 files changed, 7 insertions, 3 deletions
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 6f83221850..b1f2c0e95c 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 8
+# stdlib_h.m4 serial 9
dnl Copyright (C) 2007, 2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -30,6 +30,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH])
GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV])
GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD])
+ GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL])
GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_CALLOC_POSIX=1; AC_SUBST([HAVE_CALLOC_POSIX])
@@ -40,6 +41,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH])
HAVE_SETENV=1; AC_SUBST([HAVE_SETENV])
HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD])
+ HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL])
HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H])
HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV])
HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG])
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 53cbed2133..c9b8951e84 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,17 +1,19 @@
-# strtoll.m4 serial 4
-dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+# strtoll.m4 serial 5
+dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
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_REPLACE_FUNCS(strtoll)
if test $ac_cv_func_strtoll = no; then
+ HAVE_STRTOLL=0
gl_PREREQ_STRTOLL
fi
fi