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

[Juanma Barranquero]

Index: emacs/src/gmalloc.c
diff -c emacs/src/gmalloc.c:1.12 emacs/src/gmalloc.c:1.13
*** emacs/src/gmalloc.c:1.12    Sat Nov  3 10:08:36 2001
--- emacs/src/gmalloc.c Tue Feb  4 09:03:12 2003
***************
*** 420,426 ****
  
    last_state_size = _heaplimit * sizeof *_heapinfo;
    last_heapinfo   = _heapinfo;
!   
    if (protect_p != state_protected_p)
      {
        state_protected_p = protect_p;
--- 420,426 ----
  
    last_state_size = _heaplimit * sizeof *_heapinfo;
    last_heapinfo   = _heapinfo;
! 
    if (protect_p != state_protected_p)
      {
        state_protected_p = protect_p;
***************
*** 992,998 ****
      return;
  
    PROTECT_MALLOC_STATE (0);
!   
    for (l = _aligned_blocks; l != NULL; l = l->next)
      if (l->aligned == ptr)
        {
--- 992,998 ----
      return;
  
    PROTECT_MALLOC_STATE (0);
! 
    for (l = _aligned_blocks; l != NULL; l = l->next)
      if (l->aligned == ptr)
        {
***************
*** 1214,1220 ****
        }
        break;
      }
!   
    PROTECT_MALLOC_STATE (1);
  }
  
--- 1214,1220 ----
        }
        break;
      }
! 
    PROTECT_MALLOC_STATE (1);
  }
  
***************
*** 1380,1386 ****
    block = BLOCK (ptr);
  
    PROTECT_MALLOC_STATE (0);
!   
    type = _heapinfo[block].busy.type;
    switch (type)
      {
--- 1380,1386 ----
    block = BLOCK (ptr);
  
    PROTECT_MALLOC_STATE (0);
! 
    type = _heapinfo[block].busy.type;
    switch (type)
      {
***************
*** 1843,1849 ****
       __ptr_t ptr;
  {
    struct hdr *hdr;
!     
    if (ptr)
      {
        hdr = ((struct hdr *) ptr) - 1;
--- 1843,1849 ----
       __ptr_t ptr;
  {
    struct hdr *hdr;
! 
    if (ptr)
      {
        hdr = ((struct hdr *) ptr) - 1;
***************
*** 1853,1859 ****
      }
    else
      hdr = NULL;
!   
    __free_hook = old_free_hook;
    free (hdr);
    __free_hook = freehook;
--- 1853,1859 ----
      }
    else
      hdr = NULL;
! 
    __free_hook = old_free_hook;
    free (hdr);
    __free_hook = freehook;
***************
*** 1887,1893 ****
  {
    struct hdr *hdr = NULL;
    __malloc_size_t osize = 0;
!     
    if (ptr)
      {
        hdr = ((struct hdr *) ptr) - 1;
--- 1887,1893 ----
  {
    struct hdr *hdr = NULL;
    __malloc_size_t osize = 0;
! 
    if (ptr)
      {
        hdr = ((struct hdr *) ptr) - 1;
***************
*** 1897,1903 ****
        if (size < osize)
        flood ((char *) ptr + size, FREEFLOOD, osize - size);
      }
!   
    __free_hook = old_free_hook;
    __malloc_hook = old_malloc_hook;
    __realloc_hook = old_realloc_hook;
--- 1897,1903 ----
        if (size < osize)
        flood ((char *) ptr + size, FREEFLOOD, osize - size);
      }
! 
    __free_hook = old_free_hook;
    __malloc_hook = old_malloc_hook;
    __realloc_hook = old_realloc_hook;