diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-05-30 09:56:18 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-05-30 09:56:18 -0400 |
| commit | 61bd8f428b2bd637591dace2d7d65af42740b898 (patch) | |
| tree | 03b00376f6fa6321781fc121179164a47a656385 /src/lib/malloc | |
| parent | 70553a91343e242e05e569d59584674a21d09679 (diff) | |
| parent | bdf685e47614ef5dca935b9fe9a608ffdd63a816 (diff) | |
| download | tor-61bd8f428b2bd637591dace2d7d65af42740b898.tar.gz tor-61bd8f428b2bd637591dace2d7d65af42740b898.zip | |
Merge branch 'tor-github/pr/1049'
Diffstat (limited to 'src/lib/malloc')
| -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 f4fda00bff..e2c41ab9c3 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) |