X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxalloc.m4;h=f47b649b5d625285c8992ca4afa2f9b37adaa884;hb=308c394b3c4ee0bc13826b381b9f0668481c4a0f;hp=07efb2f7f757d3ba8a69e0151655e9accecc8519;hpb=8224e3007771aa0ef666eb1ff1d2564208cc2c91;p=gnulib.git

diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index 07efb2f7f..f47b649b5 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,34 +1,22 @@
-# xalloc.m4 serial 7
-dnl Copyright (C) 2002-2003 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.
+# xalloc.m4 serial 17
+dnl Copyright (C) 2002-2006, 2009-2012 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_XALLOC],
 [
   gl_PREREQ_XALLOC
   gl_PREREQ_XMALLOC
-  gl_PREREQ_XSTRDUP
 ])
 
 # Prerequisites of lib/xalloc.h.
 AC_DEFUN([gl_PREREQ_XALLOC], [
-  AC_REQUIRE([gl_SIZE_MAX])
-  AC_REQUIRE([gl_PTRDIFF_MAX])
+  AC_REQUIRE([gl_INLINE])
   :
 ])
 
 # Prerequisites of lib/xmalloc.c.
 AC_DEFUN([gl_PREREQ_XMALLOC], [
-  AC_REQUIRE([AC_C_INLINE])
-  AC_REQUIRE([jm_FUNC_MALLOC])
-  AC_REQUIRE([jm_FUNC_REALLOC])
-  :
-])
-
-# Prerequisites of lib/xstrdup.c.
-AC_DEFUN([gl_PREREQ_XSTRDUP], [
   :
 ])