diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-05-11 05:34:05 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-11 05:34:06 -0500 |
| commit | 7b7bef722cb92e2ff5af32033cacf03d16907c04 (patch) | |
| tree | 5154620e5becf4d34ebf2db859d1427d5cbc16f0 | |
| parent | 4f0d2320d047513510d86cba27a94d831cf1af29 (diff) | |
| parent | 2d4dc0c9639f52fb8db3dc9a8e5c59a4a0cac401 (diff) | |
Merge "Fix error's produced by astmm.h when standard allocators are used."
| -rw-r--r-- | include/asterisk/astmm.h | 16 | ||||
| -rw-r--r-- | res/res_fax_spandsp.c | 10 |
2 files changed, 14 insertions, 12 deletions
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index 6086509ab..1d778d4c5 100644 --- a/include/asterisk/astmm.h +++ b/include/asterisk/astmm.h @@ -95,21 +95,21 @@ void __ast_mm_init_phase_2(void); __ast_vasprintf(a,b,c,__FILE__, __LINE__, __PRETTY_FUNCTION__) #else #define calloc(a,b) \ - Do_not_use_calloc__use_ast_calloc(a,b) + Do_not_use_calloc__use_ast_calloc->fail(a,b) #define malloc(a) \ - Do_not_use_malloc__use_ast_malloc(a) + Do_not_use_malloc__use_ast_malloc->fail(a) #define free(a) \ - Do_not_use_free__use_ast_free_or_ast_std_free_for_remotely_allocated_memory(a) + Do_not_use_free__use_ast_free_or_ast_std_free_for_remotely_allocated_memory->fail(a) #define realloc(a,b) \ - Do_not_use_realloc__use_ast_realloc(a,b) + Do_not_use_realloc__use_ast_realloc->fail(a,b) #define strdup(a) \ - Do_not_use_strdup__use_ast_strdup(a) + Do_not_use_strdup__use_ast_strdup->fail(a) #define strndup(a,b) \ - Do_not_use_strndup__use_ast_strndup(a,b) + Do_not_use_strndup__use_ast_strndup->fail(a,b) #define asprintf(a, b, c...) \ - Do_not_use_asprintf__use_ast_asprintf(a,b,c) + Do_not_use_asprintf__use_ast_asprintf->fail(a,b,c) #define vasprintf(a,b,c) \ - Do_not_use_vasprintf__use_ast_vasprintf(a,b,c) + Do_not_use_vasprintf__use_ast_vasprintf->fail(a,b,c) #endif /* Provide our own definitions */ diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c index 288f91dac..42492273d 100644 --- a/res/res_fax_spandsp.c +++ b/res/res_fax_spandsp.c @@ -48,14 +48,16 @@ <support_level>extended</support_level> ***/ -#include "asterisk.h" - -ASTERISK_REGISTER_FILE() - +/* Include spandsp headers before asterisk.h so the inline functions can continue using + * malloc and free, even with MALLOC_DEBUG enabled. */ #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES #include <spandsp.h> #include <spandsp/version.h> +#include "asterisk.h" + +ASTERISK_REGISTER_FILE() + #include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/strings.h" |