diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 14:20:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 15:26:07 -0800 |
| commit | e4cd4a76a621927bc155a18353ef7fd09133887d (patch) | |
| tree | bdc6224d8cf108d37b82763dcfd629dea1c886e8 /src/unexelf.c | |
| parent | e1a9f2099c2e683dffc4b898ce85ce935c4cb254 (diff) | |
| download | emacs-e4cd4a76a621927bc155a18353ef7fd09133887d.tar.gz | |
* src/alloc.c: Include "sheap.h".
(alloc_unexec_pre, alloc_unexec_post) [HYBRID_MALLOC]:
Set and clear bss_sbrk_did_unexec, on all platforms not just Cygwin.
* src/lisp.h (alloc_unexec_pre, alloc_unexec_post) [!DOUG_LEA_MALLOC]:
Declare unconditionally.
* src/unexcw.c, src/unexelf.c (bss_sbrk_did_unexec): Remove decl.
(unexec): Don’t set or clear bss_sbrk_did_unexec;
the caller now does this.
(Bug#22086)
Diffstat (limited to 'src/unexelf.c')
| -rw-r--r-- | src/unexelf.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/unexelf.c b/src/unexelf.c index 3dc0456d9b6..e90199472ed 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -211,10 +211,6 @@ entry_address (void *section_h, ptrdiff_t idx, ptrdiff_t entsize) typedef unsigned char byte; -#ifdef HYBRID_MALLOC -extern int bss_sbrk_did_unexec; -#endif - /* **************************************************************** * unexec * @@ -231,10 +227,6 @@ unexec (const char *new_name, const char *old_name) off_t new_file_size; void *new_break; -#ifdef HYBRID_MALLOC - bss_sbrk_did_unexec = 1; -#endif - /* Pointers to the base of the image of the two files. */ caddr_t old_base, new_base; |