X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcalloc.m4;h=b0637b44ad5b74a1b8d0aeb0e7d349608df82bed;hb=c3f50f5713bf49cfca0893ce6c6e0c24035b8171;hp=3432493f491625532b0cbb934349305b1696dc1a;hpb=e8b82791a9b8ebb792a6a40e0b0db3c1edf71f5d;p=gnulib.git

diff --git a/m4/calloc.m4 b/m4/calloc.m4
index 3432493f4..b0637b44a 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,6 +1,6 @@
-# calloc.m4 serial 7
+# calloc.m4 serial 9
 
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004-2009 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,14 +12,14 @@
 # If so, define HAVE_CALLOC.  Otherwise, define calloc to rpl_calloc
 # and arrange to use a calloc wrapper function that does work in that case.
 
-# _AC_FUNC_CALLOC_IF(IF-WORKS, IF-NOT)
+# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT])
 # -------------------------------------
 # If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT.
 AC_DEFUN([_AC_FUNC_CALLOC_IF],
 [AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull,
+AC_CACHE_CHECK([for GNU libc compatible calloc], [ac_cv_func_calloc_0_nonnull],
 [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-		  [exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));])],
+		  [[exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));]])],
 	       [ac_cv_func_calloc_0_nonnull=yes],
 	       [ac_cv_func_calloc_0_nonnull=no],
 	       [ac_cv_func_calloc_0_nonnull=no])])
@@ -33,10 +33,10 @@ AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2])
 # needed.
 AC_DEFUN([AC_FUNC_CALLOC],
 [_AC_FUNC_CALLOC_IF(
-  [AC_DEFINE([HAVE_CALLOC], 1,
+  [AC_DEFINE([HAVE_CALLOC], [1],
 	     [Define to 1 if your system has a GNU libc compatible `calloc'
 	      function, and to 0 otherwise.])],
-  [AC_DEFINE([HAVE_CALLOC], 0)
+  [AC_DEFINE([HAVE_CALLOC], [0])
    AC_LIBOBJ([calloc])
    AC_DEFINE([calloc], [rpl_calloc],
       [Define to rpl_calloc if the replacement function should be used.])])
@@ -49,21 +49,10 @@ AC_DEFUN([AC_FUNC_CALLOC],
 # fails), and replace calloc if it is not.
 AC_DEFUN([gl_FUNC_CALLOC_POSIX],
 [
-  AC_CACHE_CHECK([whether calloc is POSIX compliant],
-    [gl_cv_func_calloc_posix],
-    [
-      dnl It is too dangerous to try to allocate a large amount of memory:
-      dnl some systems go to their knees when you do that. So assume that
-      dnl all Unix implementations of the function are POSIX compliant.
-      AC_TRY_COMPILE([],
-        [#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-         choke me
-         #endif
-        ], [gl_cv_func_calloc_posix=yes], [gl_cv_func_calloc_posix=no])
-    ])
-  if test $gl_cv_func_calloc_posix = yes; then
+  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
+  if test $gl_cv_func_malloc_posix = yes; then
     HAVE_CALLOC_POSIX=1
-    AC_DEFINE([HAVE_CALLOC_POSIX], 1,
+    AC_DEFINE([HAVE_CALLOC_POSIX], [1],
       [Define if the 'calloc' function is POSIX compliant.])
   else
     AC_LIBOBJ([calloc])