Build: Fix compile issues with seldom used modules
authorGeorge Joseph <gjoseph@digium.com>
Tue, 29 Oct 2019 13:23:54 +0000 (07:23 -0600)
committerGeorge Joseph <gjoseph@digium.com>
Thu, 7 Nov 2019 13:31:53 +0000 (08:31 -0500)
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

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

index 3f67dd5..9336f3f 100644 (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);
        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
 
index 3fe29cc..c878041 100644 (file)
@@ -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);
index cf56c9d..0f0baab 100644 (file)
@@ -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();