diff options
| author | Paul Eggert | 2011-07-10 23:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-10 23:05:57 -0700 |
| commit | da85a02af7585384008d3ebec836a7b8571f175d (patch) | |
| tree | e6d4f34119ea1c45985eaed207ef6b47f650ea93 /src/alloc.c | |
| parent | 7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff) | |
| parent | 4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff) | |
| download | emacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.gz emacs-da85a02af7585384008d3ebec836a7b8571f175d.zip | |
Merge from trunk.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 5cdd5af9ecf..f325b6ed449 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1277,7 +1277,7 @@ emacs_blocked_realloc (void *ptr, size_t size, const void *ptr2) | |||
| 1277 | calls malloc because it is the first call, and we have an endless loop. */ | 1277 | calls malloc because it is the first call, and we have an endless loop. */ |
| 1278 | 1278 | ||
| 1279 | void | 1279 | void |
| 1280 | reset_malloc_hooks () | 1280 | reset_malloc_hooks (void) |
| 1281 | { | 1281 | { |
| 1282 | __free_hook = old_free_hook; | 1282 | __free_hook = old_free_hook; |
| 1283 | __malloc_hook = old_malloc_hook; | 1283 | __malloc_hook = old_malloc_hook; |