[Emacs-diffs] /srv/bzr/emacs/trunk r105963: Port --enable-checking=all to Fedora 14 x86-64.

[Paul Eggert]

------------------------------------------------------------
revno: 105963
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-30 00:16:38 -0700
message:
  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.
modified:
  src/ChangeLog
  src/charset.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-30 03:25:46 +0000
+++ b/src/ChangeLog     2011-09-30 07:16:38 +0000
@@ -1,5 +1,9 @@
 2011-09-30  Paul Eggert  <address@hidden>
 
+       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.

=== modified file 'src/charset.c'
--- a/src/charset.c     2011-09-30 03:25:46 +0000
+++ b/src/charset.c     2011-09-30 07:16:38 +0000
@@ -2337,7 +2337,9 @@
      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)
   };