diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index 3c622d05ff1..14c3a4cb8d7 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1036,9 +1036,12 @@ lisp_free (void *block) | |||
| 1036 | return; | 1036 | return; |
| 1037 | 1037 | ||
| 1038 | MALLOC_BLOCK_INPUT; | 1038 | MALLOC_BLOCK_INPUT; |
| 1039 | #ifndef GC_MALLOC_CHECK | ||
| 1040 | struct mem_node *m = mem_find (block); | ||
| 1041 | #endif | ||
| 1039 | free (block); | 1042 | free (block); |
| 1040 | #ifndef GC_MALLOC_CHECK | 1043 | #ifndef GC_MALLOC_CHECK |
| 1041 | mem_delete (mem_find (block)); | 1044 | mem_delete (m); |
| 1042 | #endif | 1045 | #endif |
| 1043 | MALLOC_UNBLOCK_INPUT; | 1046 | MALLOC_UNBLOCK_INPUT; |
| 1044 | } | 1047 | } |
| @@ -6197,6 +6200,7 @@ garbage_collect (void) | |||
| 6197 | 6200 | ||
| 6198 | mark_pinned_objects (); | 6201 | mark_pinned_objects (); |
| 6199 | mark_pinned_symbols (); | 6202 | mark_pinned_symbols (); |
| 6203 | mark_lread (); | ||
| 6200 | mark_terminals (); | 6204 | mark_terminals (); |
| 6201 | mark_kboards (); | 6205 | mark_kboards (); |
| 6202 | mark_threads (); | 6206 | mark_threads (); |
| @@ -6319,7 +6323,7 @@ where each entry has the form (NAME SIZE USED FREE), where: | |||
| 6319 | to return them to the OS). | 6323 | to return them to the OS). |
| 6320 | 6324 | ||
| 6321 | However, if there was overflow in pure space, and Emacs was dumped | 6325 | However, if there was overflow in pure space, and Emacs was dumped |
| 6322 | using the 'unexec' method, `garbage-collect' returns nil, because | 6326 | using the \"unexec\" method, `garbage-collect' returns nil, because |
| 6323 | real GC can't be done. | 6327 | real GC can't be done. |
| 6324 | 6328 | ||
| 6325 | Note that calling this function does not guarantee that absolutely all | 6329 | Note that calling this function does not guarantee that absolutely all |