summaryrefslogtreecommitdiff
path: root/include/asterisk/utils.h
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2015-03-27 12:27:23 +0000
committerCorey Farrell <git@cfware.com>2015-03-27 12:27:23 +0000
commit10458d2878334557318d8596f3eb2ac2d0173ef7 (patch)
tree9f0d4cbe4c6711a21829d8bd2c13a068d7d7bfd6 /include/asterisk/utils.h
parent28e3bd0af7d15f0b1e9dae5f0422ae0fe627b9cd (diff)
Fix link error for utils/aelparse.
Use the standard ast_log instead of ast_log_safe for STANDALONE programs. Review: https://reviewboard.asterisk.org/r/4538/ ........ Merged revisions 433549 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 433550 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/utils.h')
-rw-r--r--include/asterisk/utils.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index e48ca02c0..1a014330e 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -525,8 +525,13 @@ long int ast_random(void);
#define ast_free free
#define ast_free_ptr ast_free
+#if !defined(STANDALONE)
#define MALLOC_FAILURE_MSG \
ast_log_safe(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file)
+#else
+#define MALLOC_FAILURE_MSG \
+ ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file)
+#endif
/*!
* \brief A wrapper for malloc()