diff options
| author | Andrea Corallo | 2020-12-27 17:54:57 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-12-27 17:54:57 +0100 |
| commit | 8fb94630136700aa4e74c7fc212b019d2db380ae (patch) | |
| tree | 69b3938a89f450509a7001f45ba3acca057fb40d /src/alloc.c | |
| parent | 271fb8a269aff924070b188f23355d0c368356dd (diff) | |
| parent | df882c9701755e2ae063f05d3381de14ae09951e (diff) | |
| download | emacs-8fb94630136700aa4e74c7fc212b019d2db380ae.tar.gz emacs-8fb94630136700aa4e74c7fc212b019d2db380ae.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 25153621298..754b8f2aef8 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -732,7 +732,11 @@ static void | |||
| 732 | malloc_unblock_input (void) | 732 | malloc_unblock_input (void) |
| 733 | { | 733 | { |
| 734 | if (block_input_in_memory_allocators) | 734 | if (block_input_in_memory_allocators) |
| 735 | unblock_input (); | 735 | { |
| 736 | int err = errno; | ||
| 737 | unblock_input (); | ||
| 738 | errno = err; | ||
| 739 | } | ||
| 736 | } | 740 | } |
| 737 | # define MALLOC_BLOCK_INPUT malloc_block_input () | 741 | # define MALLOC_BLOCK_INPUT malloc_block_input () |
| 738 | # define MALLOC_UNBLOCK_INPUT malloc_unblock_input () | 742 | # define MALLOC_UNBLOCK_INPUT malloc_unblock_input () |