X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoull.m4;h=e58e13666db48c2196fa5e8b63ab150600cbf4c0;hb=580effc9a799bd5c5b0d0ffb1830dffb76842c7e;hp=398a86d1876d018a4dba135218eaa611985abccb;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index 398a86d18..e58e13666 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,17 +1,20 @@
-# strtoull.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# strtoull.m4 serial 6
+dnl Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software Foundation,
+dnl 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