X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcalloc.m4;h=d4d92f3c8fe99566f9e46f220ef680ea1584eb4c;hb=805a9c8bdfccfa7d83b381ca80894f2c416b8402;hp=fee15ddbccfdbc5c8b136abb0b37c0e60a75e2a4;hpb=bf6364cb9f7888c0bb13f4290ba45939dbc9708c;p=gnulib.git

diff --git a/m4/calloc.m4 b/m4/calloc.m4
index fee15ddbc..d4d92f3c8 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,10 +1,14 @@
-#serial 1
+# calloc.m4 serial 4
 
-# FIXME: remove this whole file once we can depend
-# on having the definition from autoconf.
-undefine([AC_FUNC_CALLOC])
+# Copyright (C) 2004 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.
 
-# Determine whether calloc (N, S) returns non-NULL when N*S is zero.
+# Written by Jim Meyering.
+
+# Determine whether calloc (N, S) returns non-NULL when N*S is zero,
+# and returns NULL when N*S overflows.
 # 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.
 
@@ -13,17 +17,11 @@ undefine([AC_FUNC_CALLOC])
 # If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT.
 AC_DEFUN([_AC_FUNC_CALLOC_IF],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_REQUIRE([AC_TYPE_SIZE_T])dnl
 AC_CHECK_HEADERS(stdlib.h)
 AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull,
-[AC_RUN_IFELSE(
-[AC_LANG_PROGRAM(
-[[#if STDC_HEADERS || HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *calloc ();
-#endif
-]],
-		 [exit (calloc (0, 0) ? 0 : 1);])],
+[AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+		  [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])])