From: Matthew Jordan Date: Tue, 2 Oct 2012 17:12:16 +0000 (+0000) Subject: Fix findings from check-in on r374177 X-Git-Tag: 11.0.0-rc1~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61ac420dfb42442d96e5827c10f7de335e3e8b9b;p=thirdparty%2Fasterisk.git Fix findings from check-in on r374177 Richard pointed out two problems with the check-in from r374177: * The ast_msg_shutdown function declaration doesn't match the prototype in main/message.c. * The ref/alloc function usage in astobj2 (in trunk) can use the ao2_t_* variants of the functions to allow the REF_DEBUG flag to enable/disable their debug counterparts. ........ Merged revisions 374210 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@374211 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/message.c b/main/message.c index f764e2774b..83486b890f 100644 --- a/main/message.c +++ b/main/message.c @@ -1302,7 +1302,7 @@ int ast_msg_tech_unregister(const struct ast_msg_tech *tech) return 0; } -void ast_msg_shutdown() +void ast_msg_shutdown(void) { if (msg_q_tp) { msg_q_tp = ast_taskprocessor_unreference(msg_q_tp);