commit a1d8409ee28b609a7d6a1a138a53628cb214a113 parent bad00108087c4c34e34966fdeb01ae1e8bb14666 Author: teor <teor@torproject.org> Date: Mon, 12 Aug 2019 09:55:29 +1000 Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0 Diffstat:
| A | changes/bug30614 | | | 4 | ++++ |
| M | src/lib/malloc/map_anon.c | | | 4 | ++++ |
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug30614 b/changes/bug30614 @@ -0,0 +1,4 @@ + o Minor bugfixes (NetBSD): + - Fix usage of minherit() on NetBSD and other platforms that define + MAP_INHERIT_{ZERO,NONE} instead of INHERIT_{ZERO,NONE}. Fixes bug + 30614; bugfix on 0.4.0.2-alpha. Patch from Taylor Campbell. diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c @@ -50,11 +50,15 @@ #ifdef INHERIT_ZERO #define FLAG_ZERO INHERIT_ZERO +#elif defined(MAP_INHERIT_ZERO) +#define FLAG_ZERO MAP_INHERIT_ZERO #endif #ifdef INHERIT_NONE #define FLAG_NOINHERIT INHERIT_NONE #elif defined(VM_INHERIT_NONE) #define FLAG_NOINHERIT VM_INHERIT_NONE +#elif defined(MAP_INHERIT_NONE) +#define FLAG_NOINHERIT MAP_INHERIT_NONE #endif #elif defined(HAVE_MADVISE)