diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-05-14 10:57:04 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-14 10:57:04 -0500 |
| commit | e092a896947e28ab43d375199d6d6c792a210bb9 (patch) | |
| tree | f141ec3870e72d5ee6c306947373b3aa2b2aa89d /main | |
| parent | 2bbfcfc647dc69089236cde0003ba88c3161d1ec (diff) | |
| parent | 478fb4a388afcb56e7e50184c996f0838d609a66 (diff) | |
Merge "MALLOC_DEBUG: Replace WRAP_LIBC_MALLOC with ASTMM_LIBC."
Diffstat (limited to 'main')
| -rw-r--r-- | main/ast_expr2.c | 2 | ||||
| -rw-r--r-- | main/ast_expr2.y | 2 | ||||
| -rw-r--r-- | main/ast_expr2f.c | 2 | ||||
| -rw-r--r-- | main/astmm.c | 11 | ||||
| -rw-r--r-- | main/hashtab.c | 2 |
5 files changed, 5 insertions, 14 deletions
diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 84a3d7b97..d41072d6e 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -91,7 +91,7 @@ * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $ */ -#define WRAP_LIBC_MALLOC +#define ASTMM_LIBC ASTMM_REDIRECT #include "asterisk.h" #include <sys/types.h> diff --git a/main/ast_expr2.y b/main/ast_expr2.y index 8a151679d..762e83d84 100644 --- a/main/ast_expr2.y +++ b/main/ast_expr2.y @@ -12,7 +12,7 @@ * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $ */ -#define WRAP_LIBC_MALLOC +#define ASTMM_LIBC ASTMM_REDIRECT #include "asterisk.h" #include <sys/types.h> diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index c2d4e00a4..c6a1b9735 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -1,4 +1,4 @@ -#define WRAP_LIBC_MALLOC +#define ASTMM_LIBC ASTMM_REDIRECT #include "asterisk.h" #line 2 "ast_expr2f.c" diff --git a/main/astmm.c b/main/astmm.c index a4d5602ce..8260460ab 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -28,6 +28,7 @@ <support_level>core</support_level> ***/ +#define ASTMM_LIBC ASTMM_IGNORE #include "asterisk.h" #if defined(__AST_DEBUG_MALLOC) @@ -61,16 +62,6 @@ enum func_type { FUNC_ASPRINTF }; -/* Undefine all our macros */ -#undef malloc -#undef calloc -#undef realloc -#undef strdup -#undef strndup -#undef free -#undef vasprintf -#undef asprintf - #define FENCE_MAGIC 0xfeedbabe /*!< Allocated memory high/low fence overwrite check. */ #define FREED_MAGIC 0xdeaddead /*!< Freed memory wipe filler. */ #define MALLOC_FILLER 0x55 /*!< Malloced memory filler. Must not be zero. */ diff --git a/main/hashtab.c b/main/hashtab.c index 27a700a9d..c08880c69 100644 --- a/main/hashtab.c +++ b/main/hashtab.c @@ -26,7 +26,7 @@ <support_level>core</support_level> ***/ -#define WRAP_LIBC_MALLOC +#define ASTMM_LIBC ASTMM_REDIRECT #include "asterisk.h" ASTERISK_REGISTER_FILE() |