diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-14 20:56:34 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-14 20:56:34 -0500 |
| commit | 1a9ed413a104a6390d5088fe5c5a1ebb0dea55a3 (patch) | |
| tree | ecea388fda1d581c56fa62fcd39d4f5fc1d817db /main | |
| parent | 0a96cd082bdf92bcfacf96ec5c7371d91c30f249 (diff) | |
| parent | 9e488dd482b0cf69b8e7bb145cd8e22e43ba1f11 (diff) | |
Merge "core: Remove incorrect usage of attribute_malloc."
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index c71d19b81..2779aa827 100644 --- a/main/channel.c +++ b/main/channel.c @@ -782,7 +782,7 @@ static int does_id_conflict(const char *uniqueid) } /*! \brief Create a new channel structure */ -static struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 0))) +static struct ast_channel *__attribute__((format(printf, 15, 0))) __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char *cid_name, const char *acctcode, const char *exten, const char *context, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, enum ama_flags amaflag, struct ast_endpoint *endpoint, |