diff src/alloc.c @ 83383:2a679c81f552

Merged from [e-mail]--gnu-2005 (patch 118-132, 551-577) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-551 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-552 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-553 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-554 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-555 Remove CVS keywords from newsticker files * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-556 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-557 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-558 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-559 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-560 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-561 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-562 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-563 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-564 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-565 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-566 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-567 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-568 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-569 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-570 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-571 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-572 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-573 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-574 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-575 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-576 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-577 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-118 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-119 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-120 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-121 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-122 Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-123 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-124 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-125 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-126 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-127 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-128 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-129 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-130 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-131 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-132 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-423

--- a/src/alloc.c	Mon Sep 19 21:25:51 2005 +0000
+++ b/src/alloc.c	Sun Oct 09 20:00:17 2005 +0000
@@ -548,6 +548,21 @@
   return (spare_memory ? Qnil : Qt);
 }
 
+/* If we released our reserve (due to running out of memory),
+   and we have a fair amount free once again,
+   try to set aside another reserve in case we run out once more.
+
+   This is called when a relocatable block is freed in ralloc.c.  */
+
+void
+refill_memory_reserve ()
+{
+#ifndef SYSTEM_MALLOC
+  if (spare_memory == 0)
+    spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
+#endif
+}
+
 /* Called if we can't allocate relocatable space for a buffer.  */
 
 void
@@ -1135,20 +1150,6 @@
 
 #ifndef SYSTEM_MALLOC
 
-/* If we released our reserve (due to running out of memory),
-   and we have a fair amount free once again,
-   try to set aside another reserve in case we run out once more.
-
-   This is called when a relocatable block is freed in ralloc.c.  */
-
-void
-refill_memory_reserve ()
-{
-  if (spare_memory == 0)
-    spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
-}
-
-
 /* Arranging to disable input signals while we're in malloc.
 
    This only works with GNU malloc.  To help out systems which can't
@@ -1162,20 +1163,21 @@
 #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 *));
+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) ();
-static void * (*old_realloc_hook) ();
-static void (*old_free_hook) ();
+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)
+emacs_blocked_free (ptr, ptr2)
      void *ptr;
+     const void *ptr2;
 {
   BLOCK_INPUT_ALLOC;
 
@@ -1222,8 +1224,9 @@
 /* This function is the malloc hook that Emacs uses.  */
 
 static void *
-emacs_blocked_malloc (size)
+emacs_blocked_malloc (size, ptr)
      size_t size;
+     const void *ptr;
 {
   void *value;
 
@@ -1269,9 +1272,10 @@
 /* This function is the realloc hook that Emacs uses.  */
 
 static void *
-emacs_blocked_realloc (ptr, size)
+emacs_blocked_realloc (ptr, size, ptr2)
      void *ptr;
      size_t size;
+     const void *ptr2;
 {
   void *value;