summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-26 00:29:02 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-26 00:29:02 +0000
commit4e3c631b709d178c7df1634f401f087dcd604071 (patch)
treeb05b897cf57825686e7d2bffaee12db359ce0894
parente04ee923d950f76132fa137f5e33ff42b94126be (diff)
- (bal) fixed NeXTStep missing munmap() issue. It defines HAVE_MMAP,
but it all damned lies.
-rw-r--r--ChangeLog4
-rw-r--r--monitor_mm.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 54e7d95c0..2b7bfd0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
30 - (bal) added back in error check for mmap(). I screwed up, Pointed 30 - (bal) added back in error check for mmap(). I screwed up, Pointed
31 out by stevesk@ 31 out by stevesk@
32 - (tim) [README.privsep] UnixWare tip no longer needed. 32 - (tim) [README.privsep] UnixWare tip no longer needed.
33 - (bal) fixed NeXTStep missing munmap() issue. It defines HAVE_MMAP,
34 but it all damned lies.
33 35
3420020625 3620020625
35 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh 37 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
@@ -1129,4 +1131,4 @@
1129 - (stevesk) entropy.c: typo in debug message 1131 - (stevesk) entropy.c: typo in debug message
1130 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1132 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1131 1133
1132$Id: ChangeLog,v 1.2285 2002/06/26 00:25:47 tim Exp $ 1134$Id: ChangeLog,v 1.2286 2002/06/26 00:29:02 mouring Exp $
diff --git a/monitor_mm.c b/monitor_mm.c
index ab4d5c957..c363036e6 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -130,12 +130,12 @@ mm_destroy(struct mm_master *mm)
130 mm_freelist(mm->mmalloc, &mm->rb_free); 130 mm_freelist(mm->mmalloc, &mm->rb_free);
131 mm_freelist(mm->mmalloc, &mm->rb_allocated); 131 mm_freelist(mm->mmalloc, &mm->rb_allocated);
132 132
133#ifdef HAVE_MMAP 133#ifdef HAVE_MMAP_ANON_SHARED
134 if (munmap(mm->address, mm->size) == -1) 134 if (munmap(mm->address, mm->size) == -1)
135 fatal("munmap(%p, %lu): %s", mm->address, (u_long)mm->size, 135 fatal("munmap(%p, %lu): %s", mm->address, (u_long)mm->size,
136 strerror(errno)); 136 strerror(errno));
137#else 137#else
138 fatal("%s: UsePrivilegeSeparation=yes not supported", 138 fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
139 __func__); 139 __func__);
140#endif 140#endif
141 if (mm->mmalloc == NULL) 141 if (mm->mmalloc == NULL)