[svn-commits] coreyfarrell: branch 13 r433550 - in /branches/13: ./ include/asterisk/utils.h

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Fri Mar 27 07:26:13 2015
New Revision: 433550

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433550
Log:
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

Modified:
    branches/13/   (props changed)
    branches/13/include/asterisk/utils.h

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/13/include/asterisk/utils.h
URL: http://svnview.digium.com/svn/asterisk/branches/13/include/asterisk/utils.h?view=diff&rev=433550&r1=433549&r2=433550
==============================================================================
--- branches/13/include/asterisk/utils.h (original)
+++ branches/13/include/asterisk/utils.h Fri Mar 27 07:26:13 2015
@@ -525,8 +525,13 @@
 #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()