From 58cf8b69dac28616b3ba7a28c3c616eaf3021d0b Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Wed, 11 Mar 2009 04:06:44 +0000 Subject: 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 --- main/features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/features.c b/main/features.c index 2f3dc9932..39e1d5d2d 100644 --- a/main/features.c +++ b/main/features.c @@ -3544,7 +3544,7 @@ static struct ast_parkinglot *build_parkinglot(char *name, struct ast_variable * /* Add a parking extension into the context */ if (!oldparkinglot) { if (!ast_strlen_zero(ast_parking_ext())) { - if (ast_add_extension2(con, 1, ast_parking_ext(), 1, NULL, NULL, parkcall, strdup(""), ast_free, registrar) == -1) + if (ast_add_extension2(con, 1, ast_parking_ext(), 1, NULL, NULL, parkcall, strdup(""), ast_free_ptr, registrar) == -1) error = 1; } } -- cgit v1.2.3