X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoull.m4;h=abf607fd7b1000cd09a0aaaf0b43a9c046f8c932;hb=19ad053d1964635d0247647dca318fa5a29ad89b;hp=49c9bbe7d38c33a2295d7ec576b7c5064970f4e9;hpb=23fe10e274cf20fb2cb75ea1da9556a733106657;p=gnulib.git

diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index 49c9bbe7d..abf607fd7 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,19 +1,19 @@
-# strtoull.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# strtoull.m4 serial 6
+dnl Copyright (C) 2002, 2004, 2006, 2008-2011 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_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' exists.
-  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
-  if test "$ac_cv_type_unsigned_long_long" = yes; then
-    AC_REPLACE_FUNCS(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_REPLACE_FUNCS([strtoull])
     if test $ac_cv_func_strtoull = no; then
+      HAVE_STRTOULL=0
       gl_PREREQ_STRTOULL
     fi
   fi
@@ -23,4 +23,3 @@ AC_DEFUN([gl_FUNC_STRTOULL],
 AC_DEFUN([gl_PREREQ_STRTOULL], [
   :
 ])
-