diff options
| author | Andreas Schwab | 2007-09-16 09:25:45 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2007-09-16 09:25:45 +0000 |
| commit | 4d580af2d7dd70d97073bf91da4f3f4d9f10bafc (patch) | |
| tree | d1c05896fd25651b24cac026ee28772d64ebee0f /src | |
| parent | 448f754fa83af6490f9e72be19f9fbae9b06f5e7 (diff) | |
| download | emacs-4d580af2d7dd70d97073bf91da4f3f4d9f10bafc.tar.gz emacs-4d580af2d7dd70d97073bf91da4f3f4d9f10bafc.zip | |
(reset_malloc_hooks): Set the hooks to the previous
values instead of zapping them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 696386952f7..12562c88c93 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-09-16 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * alloc.c (reset_malloc_hooks): Set the hooks to the previous | ||
| 4 | values instead of zapping them. | ||
| 5 | |||
| 1 | 2007-09-14 Glenn Morris <rgm@gnu.org> | 6 | 2007-09-14 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * fringe.c (init_fringe_bitmap) <swap_nibble>: Move to file scope. | 8 | * fringe.c (init_fringe_bitmap) <swap_nibble>: Move to file scope. |
diff --git a/src/alloc.c b/src/alloc.c index 8aea81a0f72..f1758158344 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1343,9 +1343,9 @@ emacs_blocked_realloc (ptr, size, ptr2) | |||
| 1343 | void | 1343 | void |
| 1344 | reset_malloc_hooks () | 1344 | reset_malloc_hooks () |
| 1345 | { | 1345 | { |
| 1346 | __free_hook = 0; | 1346 | __free_hook = old_free_hook; |
| 1347 | __malloc_hook = 0; | 1347 | __malloc_hook = old_malloc_hook; |
| 1348 | __realloc_hook = 0; | 1348 | __realloc_hook = old_realloc_hook; |
| 1349 | } | 1349 | } |
| 1350 | #endif /* HAVE_GTK_AND_PTHREAD */ | 1350 | #endif /* HAVE_GTK_AND_PTHREAD */ |
| 1351 | 1351 | ||