]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix findings from check-in on r374177
authorMatthew Jordan <mjordan@digium.com>
Tue, 2 Oct 2012 17:12:16 +0000 (17:12 +0000)
committerMatthew Jordan <mjordan@digium.com>
Tue, 2 Oct 2012 17:12:16 +0000 (17:12 +0000)
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

main/message.c

index f764e2774b09991e3919eceac8a5867ac7afeb1b..83486b890fcb8cb6c914c94b2fac05b123b05da6 100644 (file)
@@ -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);