kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-11 07:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an ABI compatibility issue with ast_log_safe for modules.

Browse Source 
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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2015-03-30 11:42:00 +00:00
parent 5f8faf16af
commit 2d39bc5528
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/utils.h
View File

@@ -525,7 +525,7 @@ long int ast_random(void);
#define ast_free free #define ast_free free
#define ast_free_ptr ast_free #define ast_free_ptr ast_free
#if !defined(STANDALONE) #if defined(AST_IN_CORE)
#define MALLOC_FAILURE_MSG \ #define MALLOC_FAILURE_MSG \
ast_log_safe(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file) ast_log_safe(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file)
#else #else

2
main/Makefile
View File

@@ -186,7 +186,7 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
GMIMELDFLAGS+=$(GMIME_LIB) GMIMELDFLAGS+=$(GMIME_LIB)
endif endif
$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" -DAST_IN_CORE
libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE) libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)