Skip to content
Snippets Groups Projects
Commit ac5c75b4 authored by Matthew Jordan's avatar Matthew Jordan
Browse files

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
parent 47bf7efc
Branches
Tags
No related merge requests found
...@@ -90,7 +90,7 @@ static struct application_tuple *application_tuple_alloc(const char *app_name, m ...@@ -90,7 +90,7 @@ static struct application_tuple *application_tuple_alloc(const char *app_name, m
ast_assert(callback != NULL); 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) { if (!tuple) {
return NULL; return NULL;
} }
...@@ -122,7 +122,7 @@ static struct message_subscription *message_subscription_alloc(const char *token ...@@ -122,7 +122,7 @@ static struct message_subscription *message_subscription_alloc(const char *token
struct message_subscription *sub; struct message_subscription *sub;
size_t size = sizeof(*sub) + strlen(token) + 1; 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) { if (!sub) {
return NULL; return NULL;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment