autoupdate

[gnulib.git] / lib / xalloc.h

diff --git a/lib/xalloc.h b/lib/xalloc.h
index 7dbcc79..987791b 100644 (file)
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -19,7 +19,6 @@
 # define XALLOC_H_
 
 # include <stddef.h>
-# include <stdnoreturn.h>
 
 # include "xalloc-oversized.h"
 
@@ -45,7 +44,7 @@ extern "C" {
    or by using gnulib's xalloc-die module.  This is the
    function to call when one wants the program to die because of a
    memory allocation failure.  */
-extern noreturn void xalloc_die (void);
+extern _Noreturn void xalloc_die (void);
 
 void *xmalloc (size_t s)
       _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1));
@@ -193,9 +192,9 @@ x2nrealloc (void *p, size_t *pn, size_t s)
         {
           /* The approximate size to use for initial small allocation
              requests, when the invoking code specifies an old size of
-             zero.  64 bytes is the largest "small" request for the
-             GNU C library malloc.  */
-          enum { DEFAULT_MXFAST = 64 };
+             zero.  This is the largest "small" request for the GNU C
+             library malloc.  */
+          enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 };
 
           n = DEFAULT_MXFAST / s;
           n += !n;