From 16d672a273d35940ab3416dd60327fdf68d58733 Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Sat, 17 Apr 2010 11:13:25 +0000 Subject: [PATCH 1/3] [1/3] gcc-4.5: Fix enum type mismatches in switch_core_sqldb.c. --- src/switch_core_sqldb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 0d6ac3d15e..530d700873 100644 --- a/src/switch_core_sqldb.c +++ b/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); From 8f2b8388fc80fc62aa762a57e0d35614cca4ad8a Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Sat, 17 Apr 2010 11:17:28 +0000 Subject: [PATCH 2/3] [2/3][sofia-sip] gcc-4.5: Fix enum type mismatch. --- libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c index 9ea45131a5..867ca7a79d 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c +++ b/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; From dc356af926cb4528289d4196540797918cc10cd2 Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Sat, 17 Apr 2010 11:17:48 +0000 Subject: [PATCH 3/3] [3/3][OpenZAP] gcc-4.5: Use zt_event_t instead of zap_oob_event_t to fix enum type mismatches. --- libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c index 15803017b5..e1552a9b77 100644 --- a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c +++ b/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)) {