[Emacs-diffs] Changes to emacs/src/alloc.c

[Richard M . Stallman]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.379 emacs/src/alloc.c:1.380
*** emacs/src/alloc.c:1.379     Sat Oct 29 20:17:48 2005
--- emacs/src/alloc.c   Sun Oct 30 07:34:05 2005
***************
*** 138,143 ****
--- 138,145 ----
  
  static __malloc_size_t bytes_used_when_full;
  
+ static __malloc_size_t bytes_used_when_reconsidered;
+ 
  /* Mark, unmark, query mark bit of a Lisp string.  S must be a pointer
     to a struct Lisp_String.  */
  
***************
*** 521,527 ****
  
  
  #ifdef DOUG_LEA_MALLOC
! #  define BYTES_USED (mallinfo ().arena)
  #else
  #  define BYTES_USED _bytes_used
  #endif
--- 523,529 ----
  
  
  #ifdef DOUG_LEA_MALLOC
! #  define BYTES_USED (mallinfo ().uordblks)
  #else
  #  define BYTES_USED _bytes_used
  #endif
***************
*** 1179,1185 ****
         The code here is correct as long as SPARE_MEMORY
         is substantially larger than the block size malloc uses.  */
        && (bytes_used_when_full
!         > ((bytes_used_now = BYTES_USED)
             + max (malloc_hysteresis, 4) * SPARE_MEMORY)))
      refill_memory_reserve ();
  
--- 1181,1187 ----
         The code here is correct as long as SPARE_MEMORY
         is substantially larger than the block size malloc uses.  */
        && (bytes_used_when_full
!         > ((bytes_used_when_reconsidered = BYTES_USED)
             + max (malloc_hysteresis, 4) * SPARE_MEMORY)))
      refill_memory_reserve ();