Merge branch 'upstream' into dfsg-orig

[tar] / gnu / malloca.c

diff --git a/gnu/malloca.c b/gnu/malloca.c
index 6b59638e2a5c730f17d17de24fd8d4b475489d2f..8992000d9c3bad9ffbe8b825add30dd50d6b8c91 100644 (file)
--- a/gnu/malloca.c
+++ b/gnu/malloca.c
@@ -23,6 +23,11 @@
 /* Specification.  */
 #include "malloca.h"
 
+#include "verify.h"
+
+/* Use the system functions, not the gnulib overrides in this file.  */
+#undef malloc
+
 /* The speed critical point in this file is freea() applied to an alloca()
    result: it must be fast, to match the speed of alloca().  The speed of
    mmalloca() and freea() in the other case are not critical, because they
@@ -52,8 +57,7 @@ struct preliminary_header { void *next; char room[MAGIC_SIZE]; };
 #define HEADER_SIZE \
   (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
 struct header { void *next; char room[HEADER_SIZE - sizeof (struct preliminary_header) + MAGIC_SIZE]; };
-/* Verify that HEADER_SIZE == sizeof (struct header).  */
-typedef int verify1[2 * (HEADER_SIZE == sizeof (struct header)) - 1];
+verify (HEADER_SIZE == sizeof (struct header));
 /* We make the hash table quite big, so that during lookups the probability
    of empty hash buckets is quite high.  There is no need to make the hash
    table resizable, because when the hash table gets filled so much that the