diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-03-06 12:08:25 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-04-04 12:56:52 -0400 |
commit | 027c536598f336014d7ef406610207ec4559d490 (patch) | |
tree | b683bcd7728c2e6b1332c1f6dc690f5829f20e7f /src/lib/malloc/map_anon.h | |
parent | 785c3f84de958e90c45e82d6126a8c66958be4e1 (diff) | |
download | tor-027c536598f336014d7ef406610207ec4559d490.tar.gz tor-027c536598f336014d7ef406610207ec4559d490.zip |
rename inherit values to avoid conflict with system defines
Diffstat (limited to 'src/lib/malloc/map_anon.h')
-rw-r--r-- | src/lib/malloc/map_anon.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/malloc/map_anon.h b/src/lib/malloc/map_anon.h index 89fb9da0f0..f101654eb8 100644 --- a/src/lib/malloc/map_anon.h +++ b/src/lib/malloc/map_anon.h @@ -33,13 +33,13 @@ /** Possible value for inherit_result_out: the memory will be kept * by any child process. */ -#define INHERIT_KEEP 0 +#define INHERIT_RES_KEEP 0 /** Possible value for inherit_result_out: the memory will be dropped in * the child process. Attempting to access it will likely cause a segfault. */ -#define INHERIT_DROP 1 +#define INHERIT_RES_DROP 1 /** Possible value for inherit_result_out: the memory will be cleared in * the child process. */ -#define INHERIT_ZERO 2 +#define INHERIT_RES_ZERO 2 /* Here we define the NOINHERIT_CAN_FAIL macro if and only if * it's possible that ANONMAP_NOINHERIT might yield inheritable memory. |