X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Ffree-hook.c;h=4d18ca2c078c11d199e5566eb8ea0ff60593530e;hp=5022b5767b27856064ca440b2733de8fcdc63bb4;hb=0a57cba46779af884cc537d18923dcb6313b9904;hpb=3e447015251ce6dcde843cbed10d9033d5538622

diff --git a/src/free-hook.c b/src/free-hook.c
index 5022b57..4d18ca2 100644
--- a/src/free-hook.c
+++ b/src/free-hook.c
@@ -141,7 +141,7 @@ check_free (void *ptr)
 	  /* I originally wrote:  "There's really no need to drop core."
 	     I have seen the error of my ways. -slb */
 	  if (strict_free_check)
-	    abort ();
+	    ABORT ();
 #endif
 	  printf("Freeing unmalloc'ed memory at %p\n", ptr);
 	  __free_hook = check_free;
@@ -155,7 +155,7 @@ check_free (void *ptr)
 #if !defined(__linux__)
 	  /* See above comment. */
 	  if (strict_free_check)
-	    abort ();
+	    ABORT ();
 #endif
 	  printf("Freeing %p twice\n", ptr);
 	  __free_hook = check_free;
@@ -264,7 +264,7 @@ check_realloc (void * ptr, size_t size)
        come from malloc. */
 #if !defined(__linux__)
       /* see comment in check_free(). */
-      abort ();
+      ABORT ();
 #endif
       printf("Realloc'ing unmalloc'ed pointer at %p\n", ptr);
     }
@@ -445,7 +445,7 @@ block_input_history blhist[BLHISTLIMIT];
 note_block_input (char *file, int line)
 {
   note_block (file, line, block_type);
-  if (interrupt_input_blocked > 2) abort();
+  if (interrupt_input_blocked > 2) ABORT();
 }
 
 note_unblock_input (char* file, int line)
@@ -485,13 +485,15 @@ log_gcpro (char *file, int line, struct gcpro *value, blocktype type)
   if (type == ungcpro_type)
     {
       if (value == gcprolist) goto OK;
-      if (! gcprolist) abort ();
+      if (! gcprolist) ABORT ();
       if (value == gcprolist->next) goto OK;
-      if (! gcprolist->next) abort ();
+      if (! gcprolist->next) ABORT ();
       if (value == gcprolist->next->next) goto OK;
-      if (! gcprolist->next->next) abort ();
+      if (! gcprolist->next->next) ABORT ();
       if (value == gcprolist->next->next->next) goto OK;
-      abort ();
+      if (! gcprolist->next->next->next) ABORT ();
+      if (value == gcprolist->next->next->next->next) goto OK;
+      ABORT ();
     OK:;
     }
   gcprohist[gcprohistptr].file = file;
@@ -587,6 +589,7 @@ show_gcprohist (void)
 	       gcprohist[j].type == gcpro2_type ? "GCPRO2" :
 	       gcprohist[j].type == gcpro3_type ? "GCPRO3" :
 	       gcprohist[j].type == gcpro4_type ? "GCPRO4" :
+	       gcprohist[j].type == gcpro5_type ? "GCPRO5" :
 	       gcprohist[j].type == ungcpro_type ? "UNGCPRO" : "???"),
 	      gcprohist[j].value);
     }