diff options
| author | Dave Love <fx@gnu.org> | 2000-09-08 14:10:31 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2000-09-08 14:10:31 +0000 |
| commit | 423193c55298af7adee7999ecfb9c8ef54572afb (patch) | |
| tree | d2ff385215c219b99a7995d2c3a493106f7871c8 /src | |
| parent | 0460aa783ece2fe09bd7a8f7ec7338c95202b7d0 (diff) | |
| download | emacs-423193c55298af7adee7999ecfb9c8ef54572afb.tar.gz | |
(r_alloc_init_fd): Conditionalize on MAP_ANON.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 17 | ||||
| -rw-r--r-- | src/ralloc.c | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fbea366446f..88902089325 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -13,6 +13,23 @@ 2000-09-08 Dave Love <fx@gnu.org> + * s/sol2.h (REL_ALLOC_MMAP): Define. + * s/irix5-0.h (REL_ALLOC_MMAP): Likewise. + + * ralloc.c: Don't include string.h (redundant). + (MAP_ANON) [REL_ALLOC_MMAP]: Ensure it's defined. + [!MAP_ANON]: Include fcntl.h. + (mmap_fd) [REL_ALLOC_MMAP]: New variable. + (r_alloc, r_re_alloc, r_alloc_free) + (mmap_enlarge, mmap_set_vars): Use it. + (r_alloc_init_fd): New function. + (__morecore) [SYSTEM_MALLOC]: Don't declare. + (r_alloc_init): Call r_alloc_init_fd. Conditionalize stuff on + malloc type. + + * Makefile.in (allocaobj) [!SYSTEM_MALLOC && REL_ALLOC_MMAP]: + Remove vm-limit.o. + * unexelf.c (SHT_MIPS_DEBUG, HDRR) [__mips__]: Really confine last change to __NetBSD__. diff --git a/src/ralloc.c b/src/ralloc.c index f6ae887f4c1..65015d5f374 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1322,10 +1322,12 @@ void r_alloc_free P_ ((POINTER_TYPE **ptr)); void r_alloc_init_fd () { +#if !MAP_ANON /* No anonymous mmap -- we need the file descriptor. */ mmap_fd = open ("/dev/zero", O_RDONLY); if (mmap_fd < 0) fatal ("cannot open /dev/zero"); +#endif } /* Return a region overlapping address range START...END, or null if |