[asterisk-commits] mjordan: branch 11 r374211 - in /branches/11: ./ main/message.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Oct  2 12:12:16 2012
New Revision: 374211

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374211
Log:
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

Modified:
    branches/11/   (props changed)
    branches/11/main/message.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/main/message.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/message.c?view=diff&rev=374211&r1=374210&r2=374211
==============================================================================
--- branches/11/main/message.c (original)
+++ branches/11/main/message.c Tue Oct  2 12:12:16 2012
@@ -1302,7 +1302,7 @@
 	return 0;
 }
 
-void ast_msg_shutdown()
+void ast_msg_shutdown(void)
 {
 	if (msg_q_tp) {
 		msg_q_tp = ast_taskprocessor_unreference(msg_q_tp);