From: Corey Farrell <git@cfware.com>
Date: Fri, 13 Mar 2015 02:10:17 +0000 (+0000)
Subject: Logger: Fix MALLOC_DEBUG build error.
X-Git-Tag: 14.0.0-beta1~1190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c21ead1f7ad3a47c5ec396778c7700bf19139e;p=thirdparty%2Fasterisk.git

Logger: Fix MALLOC_DEBUG build error.

Revision 432834 introduced a build error when MALLOC_DEBUG
is used.  Switch callid threadstorage to simple
AST_THREADSTORAGE since we no longer need custom cleanup.

Reported by: Corey Farrell


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

diff --git a/main/logger.c b/main/logger.c
index ad489f492f..2f69b1ab0d 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -85,7 +85,7 @@ static int logger_initialized;
 static volatile int next_unique_callid = 1; /* Used to assign unique call_ids to calls */
 static int display_callids;
 
-AST_THREADSTORAGE_CUSTOM(unique_callid, NULL, ast_free);
+AST_THREADSTORAGE(unique_callid);
 
 static enum rotatestrategy {
 	NONE = 0,                /* Do not rotate log files at all, instead rely on external mechanisms */