summaryrefslogtreecommitdiff
path: root/main/strings.c
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2016-08-19 19:19:28 -0400
committerCorey Farrell <git@cfware.com>2016-08-24 11:02:47 -0500
commitcb8fd610e20fef4de5f779fda33af7795c9e8a5b (patch)
tree524b9e663ef7df64ee24053cc452792946891b87 /main/strings.c
parentb8b5d52b5e1f81a6116fb23e75cbe5a9d3b94673 (diff)
Fix checks for allocation debugging.
MALLOC_DEBUG should not be used to check if debugging is actually enabled, __AST_DEBUG_MALLOC should be used instead. MALLOC_DEBUG only indicates that debugging is requested, __AST_DEBUG_MALLOC indicates it is active. Change-Id: I3ce9cdb6ec91b74ee1302941328462231be1ea53
Diffstat (limited to 'main/strings.c')
-rw-r--r--main/strings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/strings.c b/main/strings.c
index db78a6cd2..7cb55def0 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -53,7 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* ast_str_append_va(...)
*/
-#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
+#ifdef __AST_DEBUG_MALLOC
int __ast_debug_str_helper(struct ast_str **buf, ssize_t max_len,
int append, const char *fmt, va_list ap, const char *file, int lineno, const char *function)
#else
@@ -112,7 +112,7 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
}
if (
-#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
+#ifdef __AST_DEBUG_MALLOC
_ast_str_make_space(buf, need, file, lineno, function)
#else
ast_str_make_space(buf, need)