From 2d39bc55286c73cb81138f1dc8eaf8217ed312f1 Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Mon, 30 Mar 2015 11:42:00 +0000
Subject: [PATCH] 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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 include/asterisk/utils.h | 2 +-
 main/Makefile            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 1a014330e1..bbcc2da938 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -525,7 +525,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 0a63c01a04..c0c0afff23 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)
 
-- 
GitLab