[asterisk-commits] mjordan: branch 12 r420099 - /branches/12/res/stasis/messaging.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Aug 5 16:47:54 CDT 2014


Author: mjordan
Date: Tue Aug  5 16:47:51 2014
New Revision: 420099

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420099
Log:
stasis: Fix compilation issue with ao2 tagged objects

Modified:
    branches/12/res/stasis/messaging.c

Modified: branches/12/res/stasis/messaging.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/stasis/messaging.c?view=diff&rev=420099&r1=420098&r2=420099
==============================================================================
--- branches/12/res/stasis/messaging.c (original)
+++ branches/12/res/stasis/messaging.c Tue Aug  5 16:47:51 2014
@@ -90,7 +90,7 @@
 
 	ast_assert(callback != NULL);
 
-	tuple = ao2_t_alloc(size, application_tuple_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
+	tuple = ao2_alloc_options(size, application_tuple_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
 	if (!tuple) {
 		return NULL;
 	}
@@ -122,7 +122,7 @@
 	struct message_subscription *sub;
 	size_t size = sizeof(*sub) + strlen(token) + 1;
 
-	sub = ao2_t_alloc(size, message_subscription_dtor, AO2_ALLOC_OPT_LOCK_RWLOCK);
+	sub = ao2_alloc_options(size, message_subscription_dtor, AO2_ALLOC_OPT_LOCK_RWLOCK);
 	if (!sub) {
 		return NULL;
 	}




More information about the asterisk-commits mailing list