From: Corey Farrell <git@cfware.com>
Date: Thu, 2 Apr 2015 10:38:03 +0000 (+0000)
Subject: Tell menuselect that MALLOC_DEBUG conflicts with DEBUG_CHAOS.
X-Git-Tag: 14.0.0-beta1~1127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=154ba47766e9195b777373af3bcf88137fac03f0;p=thirdparty%2Fasterisk.git

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
---

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 49a3547672..1a2e78ff87 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">