diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-21 10:46:30 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-21 10:46:30 -0500 |
commit | fa892d8dfd789af2e93f33ebf6686104dd84ad4a (patch) | |
tree | 6589230af55ebf561ae020bf57f5e2480c6411bb /build_tools | |
parent | 39ba6aacf8a56e923e581d9bf5833b5e83ca7d53 (diff) | |
parent | 4d1c9d87115d5ac6663f16d298e435cb37198653 (diff) |
Merge "core: Stop using AST_INLINE_API for allocator functions."
Diffstat (limited to 'build_tools')
-rw-r--r-- | build_tools/cflags.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index f05f42869..c4f9458ec 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -78,11 +78,9 @@ <support_level>extended</support_level> </member> <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations"> - <conflict>DEBUG_CHAOS</conflict> <support_level>core</support_level> </member> <member name="DEBUG_CHAOS" displayname="Randomly FAIL memory allocations or other operations"> - <conflict>MALLOC_DEBUG</conflict> <support_level>core</support_level> </member> <member name="ADDRESS_SANITIZER" displayname="Address Sanitizer"> |