]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix dev-mode build on recent gcc
authorKinsey Moore <kmoore@digium.com>
Wed, 7 Jan 2015 03:01:39 +0000 (03:01 +0000)
committerKinsey Moore <kmoore@digium.com>
Wed, 7 Jan 2015 03:01:39 +0000 (03:01 +0000)
........

Merged revisions 430274 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430275 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp_engine.c
res/res_pjsip.c
res/res_pjsip/pjsip_options.c

index 962899b575f3b042a32bbe480a75df9b2b9c8fa2..a827cfc875930cd81f8f2439630107681917b7fb 100644 (file)
@@ -1947,8 +1947,8 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg,
        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,
index 2d0f2cdcf6062da50253e9763766698461d8c409..e1df15c114741786d64ef8bff2ceaa8c55079a80 100644 (file)
@@ -2693,7 +2693,7 @@ static void send_request_cb(void *token, pjsip_event *e)
                }
                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;
        }
 
index 1c3c9347eeccc3469e30b9b16730c1967f5648d6..92755523029cd5bd7edef560064fc233a458c0c5 100644 (file)
@@ -261,7 +261,7 @@ static void qualify_contact_cb(void *token, pjsip_event *e)
 
        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: