Author: coreyfarrell Date: Mon Mar 30 06:43:19 2015 New Revision: 433774 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433774 Log: Fix an ABI compatibility issue with ast_log_safe for modules.
Binary modules are sometimes built against the latest release of Asterisk in each branch, and need to be compatible with all releases of that branch. This change ensures that utils.h only uses ast_log_safe from the core. For modules and utilities ast_log is used instead. Review: https://reviewboard.asterisk.org/r/4548/ ........ Merged revisions 433772 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 433773 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/include/asterisk/utils.h trunk/main/Makefile Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/include/asterisk/utils.h URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/utils.h?view=diff&rev=433774&r1=433773&r2=433774 ============================================================================== --- trunk/include/asterisk/utils.h (original) +++ trunk/include/asterisk/utils.h Mon Mar 30 06:43:19 2015 @@ -525,7 +525,7 @@ #define ast_free free #define ast_free_ptr ast_free -#if !defined(STANDALONE) +#if defined(AST_IN_CORE) #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 Modified: trunk/main/Makefile URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=433774&r1=433773&r2=433774 ============================================================================== --- trunk/main/Makefile (original) +++ trunk/main/Makefile Mon Mar 30 06:43:19 2015 @@ -186,7 +186,7 @@ GMIMELDFLAGS+=$(GMIME_LIB) endif -$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" +$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" -DAST_IN_CORE libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE) -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
