Merge branch 'master' of git@git.freeswitch.org:freeswitch

libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c

@@ -978,7 +978,7 @@ ZIO_SPAN_POLL_EVENT_FUNCTION(zt_poll_event)
 ZIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
 {
 	uint32_t i, event_id = 0;
-	zap_oob_event_t zt_event_id = 0;
+	zt_event_t zt_event_id = 0;
 
 	for(i = 1; i <= span->chan_count; i++) {
 		if (zap_test_flag(span->channels[i], ZAP_CHANNEL_EVENT)) {

libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c

@@ -1469,7 +1469,7 @@ int sdp_media_cmp(sdp_media_t const *a, sdp_media_t const *b)
 
   if (a->m_proto != b->m_proto)
     return a->m_proto < b->m_proto ? -1 : 1;
-  if (a->m_proto == sdp_media_x)
+  if (a->m_proto == sdp_proto_x)
     if ((rv = su_strcmp(a->m_proto_name, b->m_proto_name)))
       return rv;
 

src/switch_core_sqldb.c

@@ -311,7 +311,7 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_h
 
 				if ((odbc_dbh = switch_odbc_handle_new(connection_options->odbc_options.dsn,
 													   connection_options->odbc_options.user, connection_options->odbc_options.pass))) {
-					if (switch_odbc_handle_connect(odbc_dbh) != SWITCH_STATUS_SUCCESS) {
+					if (switch_odbc_handle_connect(odbc_dbh) != SWITCH_ODBC_SUCCESS) {
 						switch_odbc_handle_destroy(&odbc_dbh);
 					}
 				}
@@ -386,7 +386,7 @@ static switch_status_t switch_cache_db_execute_sql_real(switch_cache_db_handle_t
 	case SCDB_TYPE_ODBC:
 		{
 			switch_odbc_statement_handle_t stmt = NULL;
-			if ((status = switch_odbc_handle_exec(dbh->native_handle.odbc_dbh, sql, &stmt, NULL)) != SWITCH_ODBC_SUCCESS) {
+			if ((status = switch_odbc_handle_exec(dbh->native_handle.odbc_dbh, sql, &stmt, NULL)) != SWITCH_STATUS_SUCCESS) {
 				errmsg = switch_odbc_handle_get_error(dbh->native_handle.odbc_dbh, stmt);
 			}
 			switch_odbc_statement_handle_free(&stmt);