kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build: Fix compile issues with seldom used modules

Browse Source 
The following modules needed tweaks for API changes.

addons/cdr_mysql.c
addons/chan_ooh323.c
apps/app_meetme.c

ASTERISK-28604

Change-Id: Ib40e513ae55b5114be035cdc929abb6a8ce2d06d
This commit is contained in:
George Joseph
2019-10-29 07:23:54 -06:00
parent e73eba85c1
commit a47cb71bb1
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/cdr_mysql.c
View File

@@ -173,7 +173,9 @@ static int mysql_log(struct ast_cdr *cdr)
{ {
struct ast_str *sql1 = ast_str_thread_get(&sql1_buf, 1024), *sql2 = ast_str_thread_get(&sql2_buf, 1024); struct ast_str *sql1 = ast_str_thread_get(&sql1_buf, 1024), *sql2 = ast_str_thread_get(&sql2_buf, 1024);
int retries = 5; int retries = 5;
#if MYSQL_VERSION_ID >= 50013 #if MYSQL_VERSION_ID >= 80001
bool my_bool_true = 1;
#elif MYSQL_VERSION_ID >= 50013
my_bool my_bool_true = 1; my_bool my_bool_true = 1;
#endif #endif
@@ -468,7 +470,9 @@ static int my_connect_db(struct ast_config *cfg)
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_RES *result; MYSQL_RES *result;
char sqldesc[128]; char sqldesc[128];
#if MYSQL_VERSION_ID >= 50013 #if MYSQL_VERSION_ID >= 80001
bool my_bool_true = 1;
#elif MYSQL_VERSION_ID >= 50013
my_bool my_bool_true = 1; my_bool my_bool_true = 1;
#endif #endif

7
addons/chan_ooh323.c
View File

@@ -536,11 +536,6 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state,
ch = NULL; ch = NULL;
} }
} }
if (ch) {
ast_publish_channel_state(ch);
}
} else { } else {
ao2_cleanup(caps); ao2_cleanup(caps);
ast_log(LOG_WARNING, "Unable to allocate channel structure\n"); ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
@@ -2225,7 +2220,7 @@ int onCallEstablished(ooCallData *call)
} }
ast_queue_control(c, AST_CONTROL_ANSWER); ast_queue_control(c, AST_CONTROL_ANSWER);
ast_publish_channel_state(c); ast_channel_publish_snapshot(c);
ast_channel_unlock(p->owner); ast_channel_unlock(p->owner);
} }
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);

2
apps/app_meetme.c
View File

@@ -1165,7 +1165,7 @@ static int meetme_stasis_init(void)
STASIS_MESSAGE_TYPE_INIT(meetme_talk_request_type); STASIS_MESSAGE_TYPE_INIT(meetme_talk_request_type);
meetme_event_message_router = stasis_message_router_create( meetme_event_message_router = stasis_message_router_create(
ast_channel_topic_all_cached()); ast_channel_topic_all());
if (!meetme_event_message_router) { if (!meetme_event_message_router) {
meetme_stasis_cleanup(); meetme_stasis_cleanup();