summaryrefslogtreecommitdiff
path: root/main/chanvars.c
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-08-26 12:55:22 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-08-26 12:55:22 -0500
commitc82cef84419addd8788ed931f7c4f4393b90c46d (patch)
tree7803ba24f6e9b09338b1876e6f55956c52e380ff /main/chanvars.c
parente3e08e11311fae66641c3df7bdda37a96969330e (diff)
parent55ccdf93c326ecbfe6a989d45f818fbf7bbe1762 (diff)
Merge "Fix checks for allocation debugging."
Diffstat (limited to 'main/chanvars.c')
-rw-r--r--main/chanvars.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/chanvars.c b/main/chanvars.c
index dc97df773..d7922522c 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -35,7 +35,7 @@ ASTERISK_REGISTER_FILE()
#include "asterisk/strings.h"
#include "asterisk/utils.h"
-#ifdef MALLOC_DEBUG
+#ifdef __AST_DEBUG_MALLOC
struct ast_var_t *_ast_var_assign(const char *name, const char *value, const char *file, int lineno, const char *function)
#else
struct ast_var_t *ast_var_assign(const char *name, const char *value)
@@ -45,7 +45,7 @@ struct ast_var_t *ast_var_assign(const char *name, const char *value)
int name_len = strlen(name) + 1;
int value_len = strlen(value) + 1;
-#ifdef MALLOC_DEBUG
+#ifdef __AST_DEBUG_MALLOC
if (!(var = __ast_calloc(sizeof(*var) + name_len + value_len, sizeof(char), file, lineno, function))) {
#else
if (!(var = ast_calloc(sizeof(*var) + name_len + value_len, sizeof(char)))) {