From: Corey Farrell <git@cfware.com>
Date: Mon, 30 Mar 2015 11:40:33 +0000 (+0000)
Subject: Fix an ABI compatibility issue with ast_log_safe for modules.
X-Git-Tag: 11.18.0-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2430daa93172208f250dc2a8de54c4e13325dd81;p=thirdparty%2Fasterisk.git

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/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@433772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 93f9e75223..ff59c85537 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -494,7 +494,7 @@ long int ast_random(void);
 #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
diff --git a/main/Makefile b/main/Makefile
index e061cf8e19..69b420285c 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -186,7 +186,7 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
+$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" -DAST_IN_CORE
 
 libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)