diff options
| author | Corey Farrell <git@cfware.com> | 2015-04-02 10:38:03 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-04-02 10:38:03 +0000 |
| commit | 154ba47766e9195b777373af3bcf88137fac03f0 (patch) | |
| tree | 41a4d37f5e5b0e20c0f2cf36b14b456e783df6ef /build_tools | |
| parent | a217d2d1db7d7af1d7da8ad2058d600194b8bab0 (diff) | |
Tell menuselect that MALLOC_DEBUG conflicts with DEBUG_CHAOS.
DEBUG_CHAOS was marked as conflicting with MALLOC_DEBUG, but
for this to work correctly MALLOC_DEBUG must also be marked
as conflicting with DEBUG_CHAOS.
Review: https://reviewboard.asterisk.org/r/4557/
........
Merged revisions 433923 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/cflags.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 49a354767..1a2e78ff8 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -77,6 +77,7 @@ <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"> |