summaryrefslogtreecommitdiff
path: root/build_tools
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2015-04-02 10:31:49 +0000
committerCorey Farrell <git@cfware.com>2015-04-02 10:31:49 +0000
commit1eb0c5f4e8a9095b312811f50c171d07d3f049e8 (patch)
tree2fd431ddf69694462b996f6ed467017fb532da30 /build_tools
parente3011859833ce36c6879dcd2d601e7e1f363bcbe (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/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'build_tools')
-rw-r--r--build_tools/cflags.xml1
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">