[Asterisk-code-review] Build: Fix compile issues with seldom used modules (asterisk[master])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/13181 )

Change subject: Build:  Fix compile issues with seldom used modules
......................................................................

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
---
M addons/cdr_mysql.c
M addons/chan_ooh323.c
M apps/app_meetme.c
3 files changed, 8 insertions(+), 9 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 3f67dd5..9336f3f 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -173,7 +173,9 @@
 {
 	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 @@
 	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 3fe29cc..c878041 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -536,11 +536,6 @@
 				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 @@
 			}
 
 			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 cf56c9d..0f0baab 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1165,7 +1165,7 @@
 	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();

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/13181
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ib40e513ae55b5114be035cdc929abb6a8ce2d06d
Gerrit-Change-Number: 13181
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20191107/a8f14aa4/attachment.html>