diff options
| author | teor <teor@torproject.org> | 2019-08-12 09:55:29 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-12 09:55:29 +1000 |
| commit | a1d8409ee28b609a7d6a1a138a53628cb214a113 (patch) | |
| tree | de089f2a63f6ad7e8d0376edbdf4a7c8aa1a6083 /src | |
| parent | bad00108087c4c34e34966fdeb01ae1e8bb14666 (diff) | |
| parent | bdf685e47614ef5dca935b9fe9a608ffdd63a816 (diff) | |
| download | tor-a1d8409ee28b609a7d6a1a138a53628cb214a113.tar.gz tor-a1d8409ee28b609a7d6a1a138a53628cb214a113.zip | |
Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/malloc/map_anon.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 2fc6e89ea2..2430f7ad11 100644 --- 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) |