summaryrefslogtreecommitdiff
path: root/pbx
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2009-03-11 04:06:44 +0000
committerJeff Peeler <jpeeler@digium.com>2009-03-11 04:06:44 +0000
commit58cf8b69dac28616b3ba7a28c3c616eaf3021d0b (patch)
tree452601c0955a6155adba6e987f37ff7628ec58ff /pbx
parentbe0c75d54ab1eab974286cfa46b4c5abfd9095fc (diff)
Fix malloc debug macros to work properly with h323.
The main problem here was that cstdlib was undefining free thereby causing the proper debug macros to not be used. ast_h323.cxx has been changed to call ast_free instead to avoid the issue. A few other issues were addressed: - There were a few instances of functions improperly passing ast_free instead of ast_free_ptr. - Some clean up was done to avoid the debug macros intentionally being redefined. (copied below from Kevin's commit, appreciate the help) - disable astmm.h from doing anything when STANDALONE is defined, which is used by the tools in the utils/ directory that use parts of Asterisk header files in hackish ways; also ensure that utils/extconf.c and utils/conf2ael.c are compiled with STANDALONE defined. (closes issue #13593) Reported by: pj git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
-rw-r--r--pbx/pbx_config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 6d29a3f32..0c90ec0ff 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1754,7 +1754,7 @@ static void pbx_load_users(void)
c = altcopy;
ext = strsep(&c, ",");
while (ext) {
- ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free, registrar);
+ ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free_ptr, registrar);
ext = strsep(&c, ",");
}
}