X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcalloc.m4;h=c1091718eff21c3b4e7b957e3d52f39a68bbc835;hb=39ef09258d67f22b4e8b04981350c978577520bd;hp=f244df7b22a62319c9c72d6751c6e497cad02eea;hpb=3cb97803e2a64ffcf24877403806a59c01cd7667;p=gnulib.git

diff --git a/m4/calloc.m4 b/m4/calloc.m4
index f244df7b2..c1091718e 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,20 +1,9 @@
-# calloc.m4 serial 3
+# calloc.m4 serial 6
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright (C) 2004, 2005, 2006 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.
 
 # Written by Jim Meyering.
 
@@ -27,9 +16,7 @@
 # -------------------------------------
 # 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_REQUIRE([AC_TYPE_SIZE_T])dnl
 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));])],