From b87e30b3187703ae4d8006ea3d515ff9854fe73d Mon Sep 17 00:00:00 2001 From: murf Date: Wed, 17 Dec 2008 05:53:02 +0000 Subject: Merged revisions 165071 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk I might add here that in I tested the merged fixes from trunk in both 1.6.0 and 1.6.1 via both 'make' and ./runtests in the ael regression tests for all but DEBUG_CHANNEL_LOCKS, DEBUG_SCHEDULER, and CHANNEL_TRACE options. ........ r165071 | murf | 2008-12-16 22:04:56 -0700 (Tue, 16 Dec 2008) | 31 lines A possibly "horrible fix" for a "horribly broken" situation. As stuff shifts around in the asterisk code, the miscellaneous inclusions from the standalone stuff gets broken. There's no easy fix for this situation. I made sure that everything in utils builds without problem ***AND*** that aelparse runs the regressions correctly with the following make menuselect options both on and off: DONT_OPTIMIZE DEBUG_THREADS DEBUG_CHANNEL_LOCKS MALLOC_DEBUG MTX_PROFILE DEBUG_SCHEDULER DEBUG_THREADLOCALS DETECT_DEADLOCKS CHANNEL_TRACE I think from now on, I'm going to #undef all these features in the various utils native files; I guess I could do the same for the copied-in files, surrounded by STANDALONE ifdef. A standalone isn't going to care about threads, mutexes, etc. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@165093 f38db490-d61c-443f-a65b-d21fe96a405b --- pbx/pbx_ael.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pbx/pbx_ael.c') diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 81801f1c9..483d79914 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -36,6 +36,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include +#ifdef STANDALONE +#ifdef HAVE_MTX_PROFILE +static int mtx_prof = -1; /* helps the standalone compile with the mtx_prof flag on */ +#endif +#endif #include "asterisk/pbx.h" #include "asterisk/config.h" #include "asterisk/module.h" -- cgit v1.2.3