From ac5c75b45d9d7fe047ccd9d1d094cb9d30df8b51 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Tue, 5 Aug 2014 21:48:05 +0000 Subject: stasis: Fix compilation issue with ao2 tagged objects ........ Merged revisions 420099 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420100 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/stasis/messaging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/stasis/messaging.c b/res/stasis/messaging.c index 47730851f..fd7cf9f7b 100644 --- a/res/stasis/messaging.c +++ b/res/stasis/messaging.c @@ -90,7 +90,7 @@ static struct application_tuple *application_tuple_alloc(const char *app_name, m 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 @@ static struct message_subscription *message_subscription_alloc(const char *token 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; } -- cgit v1.2.3