From 8cb345c99eb8b691e4b222b52298f20a77bd1a90 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Tue, 2 Oct 2012 17:23:46 +0000 Subject: [PATCH] Merged revisions 374210 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ........ r374210 | mjordan | 2012-10-02 12:10:04 -0500 (Tue, 02 Oct 2012) | 10 lines 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 11+) can use the ao2_t_* variants of the functions to allow the REF_DEBUG flag to enable/disable their debug counterparts. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@374226 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/message.c b/main/message.c index c23c4ed04c..ab428a0343 100644 --- a/main/message.c +++ b/main/message.c @@ -1299,7 +1299,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); -- 2.47.2