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

[Dan Nicolaescu]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.374 emacs/src/alloc.c:1.375
*** emacs/src/alloc.c:1.374     Sat Jul 23 19:08:06 2005
--- emacs/src/alloc.c   Fri Sep 30 22:38:16 2005
***************
*** 1161,1180 ****
  #ifndef SYNC_INPUT
  
  #ifndef DOUG_LEA_MALLOC
! extern void * (*__malloc_hook) P_ ((size_t));
! extern void * (*__realloc_hook) P_ ((void *, size_t));
! extern void (*__free_hook) P_ ((void *));
  /* Else declared in malloc.h, perhaps with an extra arg.  */
  #endif /* DOUG_LEA_MALLOC */
! static void * (*old_malloc_hook) ();
! static void * (*old_realloc_hook) ();
! static void (*old_free_hook) ();
  
  /* This function is used as the hook for free to call.  */
  
  static void
! emacs_blocked_free (ptr)
       void *ptr;
  {
    BLOCK_INPUT_ALLOC;
  
--- 1161,1181 ----
  #ifndef SYNC_INPUT
  
  #ifndef DOUG_LEA_MALLOC
! extern void * (*__malloc_hook) P_ ((size_t, const void *));
! extern void * (*__realloc_hook) P_ ((void *, size_t, const void *));
! extern void (*__free_hook) P_ ((void *, const void *));
  /* Else declared in malloc.h, perhaps with an extra arg.  */
  #endif /* DOUG_LEA_MALLOC */
! static void * (*old_malloc_hook) P_ ((size_t, const void *));
! static void * (*old_realloc_hook) P_ ((void *,  size_t, const void*));
! static void (*old_free_hook) P_ ((void*, const void*));
  
  /* This function is used as the hook for free to call.  */
  
  static void
! emacs_blocked_free (ptr, ptr2)
       void *ptr;
+      const void *ptr2;
  {
    BLOCK_INPUT_ALLOC;
  
***************
*** 1221,1228 ****
  /* This function is the malloc hook that Emacs uses.  */
  
  static void *
! emacs_blocked_malloc (size)
       size_t size;
  {
    void *value;
  
--- 1222,1230 ----
  /* This function is the malloc hook that Emacs uses.  */
  
  static void *
! emacs_blocked_malloc (size, ptr)
       size_t size;
+      const void *ptr;
  {
    void *value;
  
***************
*** 1268,1276 ****
  /* This function is the realloc hook that Emacs uses.  */
  
  static void *
! emacs_blocked_realloc (ptr, size)
       void *ptr;
       size_t size;
  {
    void *value;
  
--- 1270,1279 ----
  /* This function is the realloc hook that Emacs uses.  */
  
  static void *
! emacs_blocked_realloc (ptr, size, ptr2)
       void *ptr;
       size_t size;
+      const void *ptr2;
  {
    void *value;