Propagating gettext into gnulib a bit better.

[gnulib.git] / lib / xalloc.h

diff --git a/lib/xalloc.h b/lib/xalloc.h
index a09015f..4b65858 100644 (file)
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -21,9 +21,6 @@
 # define XALLOC_H_
 
 # include <stddef.h>
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 
 # ifndef __attribute__
 #  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
@@ -68,16 +65,14 @@ char *xstrdup (const char *str);
    works correctly even when SIZE_MAX < N.
 
    By gnulib convention, SIZE_MAX represents overflow in size
-   calculations, so reject attempted allocations of exactly SIZE_MAX
-   bytes.  However, malloc (SIZE_MAX) fails on all known hosts where
-   PTRDIFF_MAX < SIZE_MAX, so do not bother to test for
+   calculations, so the conservative dividend to use here is
+   SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
+   However, malloc (SIZE_MAX) fails on all known hosts where
+   sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
    exactly-SIZE_MAX allocations on such hosts; this avoids a test and
    branch when S is known to be 1.  */
-# if defined PTRDIFF_MAX && PTRDIFF_MAX < SIZE_MAX
-#  define xalloc_oversized(n, s) ((size_t) -1 / (s) < (n))
-# else
-#  define xalloc_oversized(n, s) ((size_t) -1 / (s) <= (n))
-# endif
+# define xalloc_oversized(n, s) \
+    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
 
 /* These macros are deprecated; they will go away soon, and are retained
    temporarily only to ease conversion to the functions described above.  */