Author: coreyfarrell Date: Thu Apr 2 05:38:03 2015 New Revision: 433924 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433924 Log: 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 Modified: trunk/ (props changed) trunk/build_tools/cflags.xml Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/build_tools/cflags.xml URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/cflags.xml?view=diff&rev=433924&r1=433923&r2=433924 ============================================================================== --- trunk/build_tools/cflags.xml (original) +++ trunk/build_tools/cflags.xml Thu Apr 2 05:38:03 2015 @@ -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"> -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits