diff options
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/ralloc.c b/src/ralloc.c index 59a15e08ad8..22a5f5bc5a7 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,5 +1,5 @@ /* Block-relocating memory allocator. - Copyright (C) 1993, 1995, 2000-2017 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 2000-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -26,11 +26,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include <stddef.h> -#ifdef emacs -# include "lisp.h" -# include "blockinput.h" -# include <unistd.h> -#endif +#include "lisp.h" +#include "blockinput.h" +#include <unistd.h> #include "getpagesize.h" @@ -924,9 +922,7 @@ r_alloc_free (void **ptr) free_bloc (dead_bloc); *ptr = 0; -#ifdef emacs refill_memory_reserve (); -#endif } /* Given a pointer at address PTR to relocatable data, resize it to SIZE. @@ -1000,7 +996,7 @@ r_re_alloc (void **ptr, size_t size) } -#if defined (emacs) && defined (DOUG_LEA_MALLOC) +#ifdef DOUG_LEA_MALLOC /* Reinitialize the morecore hook variables after restarting a dumped Emacs. This is needed when using Doug Lea's malloc from GNU libc. */ |