From: Corey Farrell Date: Fri, 27 Mar 2015 12:27:23 +0000 (+0000) Subject: Fix link error for utils/aelparse. X-Git-Tag: 14.0.0-beta1~1153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10458d2878334557318d8596f3eb2ac2d0173ef7;p=thirdparty%2Fasterisk.git 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 --- diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index e48ca02c0b..1a014330e1 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()