From e4cd4a76a621927bc155a18353ef7fd09133887d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 30 Jan 2016 14:20:57 -0800 Subject: * src/alloc.c: Include "sheap.h". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (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) --- src/unexelf.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/unexelf.c') 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; -- cgit v1.2.1