Author: kmoore Date: Tue Jan 6 21:01:39 2015 New Revision: 430275 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430275 Log: Fix dev-mode build on recent gcc ........
Merged revisions 430274 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/main/rtp_engine.c trunk/res/res_pjsip.c trunk/res/res_pjsip/pjsip_options.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/main/rtp_engine.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/rtp_engine.c?view=diff&rev=430275&r1=430274&r2=430275 ============================================================================== --- trunk/main/rtp_engine.c (original) +++ trunk/main/rtp_engine.c Tue Jan 6 21:01:39 2015 @@ -1947,8 +1947,8 @@ if (payload->report->type == AST_RTP_RTCP_SR) { char sec[32]; char usec[32]; - snprintf(sec, sizeof(sec), "%lu", payload->report->sender_information.ntp_timestamp.tv_sec); - snprintf(usec, sizeof(usec), "%lu", payload->report->sender_information.ntp_timestamp.tv_usec); + snprintf(sec, sizeof(sec), "%ld", payload->report->sender_information.ntp_timestamp.tv_sec); + snprintf(usec, sizeof(usec), "%ld", payload->report->sender_information.ntp_timestamp.tv_usec); json_rtcp_sender_info = ast_json_pack("{s: s, s: s, s: i, s: i, s: i}", "ntp_timestamp_sec", sec, "ntp_timestamp_usec", usec, Modified: trunk/res/res_pjsip.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=430275&r1=430274&r2=430275 ============================================================================== --- trunk/res/res_pjsip.c (original) +++ trunk/res/res_pjsip.c Tue Jan 6 21:01:39 2015 @@ -2693,7 +2693,7 @@ } break; default: - ast_log(LOG_ERROR, "Unexpected PJSIP event %d\n", e->body.tsx_state.type); + ast_log(LOG_ERROR, "Unexpected PJSIP event %u\n", e->body.tsx_state.type); break; } Modified: trunk/res/res_pjsip/pjsip_options.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_options.c?view=diff&rev=430275&r1=430274&r2=430275 ============================================================================== --- trunk/res/res_pjsip/pjsip_options.c (original) +++ trunk/res/res_pjsip/pjsip_options.c Tue Jan 6 21:01:39 2015 @@ -261,7 +261,7 @@ switch(e->body.tsx_state.type) { default: - ast_log(LOG_ERROR, "Unexpected PJSIP event %d\n", e->body.tsx_state.type); + ast_log(LOG_ERROR, "Unexpected PJSIP event %u\n", e->body.tsx_state.type); /* Fall through */ case PJSIP_EVENT_TRANSPORT_ERROR: case PJSIP_EVENT_TIMER: -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
