From 3930c88bfc6d4e0d98baf6edabb78dec58090938 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 30 Sep 2011 00:16:38 -0700 Subject: [PATCH] Port --enable-checking=all to Fedora 14 x86-64. * charset.c (syms_of_charset): Also account for glibc malloc's internal overhead when calculating the initial malloc maximum. --- src/ChangeLog | 4 ++++ src/charset.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d6e5390c84f..d976234f0c5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-09-30 Paul Eggert + Port --enable-checking=all to Fedora 14 x86-64. + * charset.c (syms_of_charset): Also account for glibc malloc's + internal overhead when calculating the initial malloc maximum. + Port --enable-checking=all to Fedora 14 x86. * alloc.c (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): Move to lisp.h. diff --git a/src/charset.c b/src/charset.c index 1209ac6b68d..f1b4897ffe6 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2337,7 +2337,9 @@ syms_of_charset (void) mmap for larger allocations, and these don't work well across dumped systems. */ enum { - initial_malloc_max = (1 << 16) - 1 - XMALLOC_OVERRUN_CHECK_OVERHEAD, + glibc_malloc_overhead = 3 * sizeof (size_t) - 1, + initial_malloc_max = + (1 << 16) - 1 - glibc_malloc_overhead - XMALLOC_OVERRUN_CHECK_OVERHEAD, charset_table_size_init = initial_malloc_max / sizeof (struct charset) }; -- 2.39.2