From: George Joseph <gjoseph@digium.com>
Date: Tue, 29 Oct 2019 13:23:54 +0000 (-0600)
Subject: Build:  Fix compile issues with seldom used modules
X-Git-Tag: 17.1.0-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36b28c98dd8fd8906b9b6eefee2489820f1a1295;p=thirdparty%2Fasterisk.git

Build:  Fix compile issues with seldom used modules

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
---

diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 3f67dd5ca7..9336f3f5e9 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -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);
 	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;
 #endif
 
@@ -468,7 +470,9 @@ static int my_connect_db(struct ast_config *cfg)
 	MYSQL_ROW row;
 	MYSQL_RES *result;
 	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;
 #endif
 
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 3fe29cc995..c878041129 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -536,11 +536,6 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state,
 				ch = NULL;
 			}
 	 	}
-
-		if (ch) {
-			ast_publish_channel_state(ch);
-
-		}
 	} else {
 		ao2_cleanup(caps);
 		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_publish_channel_state(c);
+			ast_channel_publish_snapshot(c);
 			ast_channel_unlock(p->owner);
 		}
 		ast_mutex_unlock(&p->lock);
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index cf56c9d308..0f0baabca5 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1165,7 +1165,7 @@ static int meetme_stasis_init(void)
 	STASIS_MESSAGE_TYPE_INIT(meetme_talk_request_type);
 
 	meetme_event_message_router = stasis_message_router_create(
-		ast_channel_topic_all_cached());
+		ast_channel_topic_all());
 
 	if (!meetme_event_message_router) {
 		meetme_stasis_cleanup();