<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13181">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Build:  Fix compile issues with seldom used modules<br><br>The following modules needed tweaks for API changes.<br><br>addons/cdr_mysql.c<br>addons/chan_ooh323.c<br>apps/app_meetme.c<br><br>ASTERISK-28604<br><br>Change-Id: Ib40e513ae55b5114be035cdc929abb6a8ce2d06d<br>---<br>M addons/cdr_mysql.c<br>M addons/chan_ooh323.c<br>M apps/app_meetme.c<br>3 files changed, 8 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c</span><br><span>index 3f67dd5..9336f3f 100644</span><br><span>--- a/addons/cdr_mysql.c</span><br><span>+++ b/addons/cdr_mysql.c</span><br><span>@@ -173,7 +173,9 @@</span><br><span> {</span><br><span>      struct ast_str *sql1 = ast_str_thread_get(&sql1_buf, 1024), *sql2 = ast_str_thread_get(&sql2_buf, 1024);</span><br><span>     int retries = 5;</span><br><span style="color: hsl(0, 100%, 40%);">-#if MYSQL_VERSION_ID >= 50013</span><br><span style="color: hsl(120, 100%, 40%);">+#if MYSQL_VERSION_ID >= 80001</span><br><span style="color: hsl(120, 100%, 40%);">+    bool my_bool_true = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif MYSQL_VERSION_ID >= 50013</span><br><span>   my_bool my_bool_true = 1;</span><br><span> #endif</span><br><span> </span><br><span>@@ -468,7 +470,9 @@</span><br><span>        MYSQL_ROW row;</span><br><span>       MYSQL_RES *result;</span><br><span>   char sqldesc[128];</span><br><span style="color: hsl(0, 100%, 40%);">-#if MYSQL_VERSION_ID >= 50013</span><br><span style="color: hsl(120, 100%, 40%);">+#if MYSQL_VERSION_ID >= 80001</span><br><span style="color: hsl(120, 100%, 40%);">+  bool my_bool_true = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif MYSQL_VERSION_ID >= 50013</span><br><span>   my_bool my_bool_true = 1;</span><br><span> #endif</span><br><span> </span><br><span>diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c</span><br><span>index 3fe29cc..c878041 100644</span><br><span>--- a/addons/chan_ooh323.c</span><br><span>+++ b/addons/chan_ooh323.c</span><br><span>@@ -536,11 +536,6 @@</span><br><span>                          ch = NULL;</span><br><span>                   }</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               if (ch) {</span><br><span style="color: hsl(0, 100%, 40%);">-                       ast_publish_channel_state(ch);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          }</span><br><span>    } else {</span><br><span>             ao2_cleanup(caps);</span><br><span>           ast_log(LOG_WARNING, "Unable to allocate channel structure\n");</span><br><span>@@ -2225,7 +2220,7 @@</span><br><span>                    }</span><br><span> </span><br><span>                        ast_queue_control(c, AST_CONTROL_ANSWER);</span><br><span style="color: hsl(0, 100%, 40%);">-                       ast_publish_channel_state(c);</span><br><span style="color: hsl(120, 100%, 40%);">+                 ast_channel_publish_snapshot(c);</span><br><span>                     ast_channel_unlock(p->owner);</span><br><span>             }</span><br><span>            ast_mutex_unlock(&p->lock);</span><br><span>diff --git a/apps/app_meetme.c b/apps/app_meetme.c</span><br><span>index cf56c9d..0f0baab 100644</span><br><span>--- a/apps/app_meetme.c</span><br><span>+++ b/apps/app_meetme.c</span><br><span>@@ -1165,7 +1165,7 @@</span><br><span>  STASIS_MESSAGE_TYPE_INIT(meetme_talk_request_type);</span><br><span> </span><br><span>      meetme_event_message_router = stasis_message_router_create(</span><br><span style="color: hsl(0, 100%, 40%);">-             ast_channel_topic_all_cached());</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_channel_topic_all());</span><br><span> </span><br><span>        if (!meetme_event_message_router) {</span><br><span>          meetme_stasis_cleanup();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13181">change 13181</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/13181"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib40e513ae55b5114be035cdc929abb6a8ce2d06d </div>
<div style="display:none"> Gerrit-Change-Number: 13181 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>