diff options
author | Matthew Jordan <mjordan@digium.com> | 2015-03-23 00:05:48 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2015-03-23 00:05:48 +0000 |
commit | 60f01520e74c7c043e506dfb65c787148205fa93 (patch) | |
tree | 3b5b534395d69dcb0389814064244f2db0ba49df /main | |
parent | 66670f02e6d662bee74e9a9cefc947da3bd1ed6f (diff) |
Fix compilations errors on 64-bit OpenBSD systems
In versiong 5.5, OpenBSD went to 64-bit time values. This requires a cast to
(long) when printing members of certain time structs.
Review: https://reviewboard.asterisk.org/r/4507
ASTERISK-24879 #close
Reported by: snuffy
Tested by: snuffy
patches:
openbsd-time64.diff uploaded by snuffy (License 5024)
........
Merged revisions 433268 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 433269 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/cdr.c | 8 | ||||
-rw-r--r-- | main/cli.c | 2 | ||||
-rw-r--r-- | main/manager.c | 2 | ||||
-rw-r--r-- | main/rtp_engine.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/main/cdr.c b/main/cdr.c index ef057f4a3..5e24dae1b 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1257,11 +1257,11 @@ static void cdr_object_finalize(struct cdr_object *cdr) /* tv_usec is suseconds_t, which could be int or long */ ast_debug(1, "Finalized CDR for %s - start %ld.%06ld answer %ld.%06ld end %ld.%06ld dispo %s\n", cdr->party_a.snapshot->name, - cdr->start.tv_sec, + (long)cdr->start.tv_sec, (long)cdr->start.tv_usec, - cdr->answer.tv_sec, + (long)cdr->answer.tv_sec, (long)cdr->answer.tv_usec, - cdr->end.tv_sec, + (long)cdr->end.tv_sec, (long)cdr->end.tv_usec, ast_cdr_disp2str(cdr->disposition)); } @@ -1296,7 +1296,7 @@ static void cdr_object_check_party_a_answer(struct cdr_object *cdr) { cdr->answer = ast_tvnow(); /* tv_usec is suseconds_t, which could be int or long */ CDR_DEBUG(mod_cfg, "%p - Set answered time to %ld.%06ld\n", cdr, - cdr->answer.tv_sec, + (long)cdr->answer.tv_sec, (long)cdr->answer.tv_usec); } } diff --git a/main/cli.c b/main/cli.c index 1d9d82ce8..1edb1f49f 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1644,7 +1644,7 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar ast_str_buffer(write_transpath), ast_str_strlen(read_transpath) ? "Yes" : "No", ast_str_buffer(read_transpath), - ast_channel_whentohangup(chan)->tv_sec, + (long)ast_channel_whentohangup(chan)->tv_sec, cdrtime, bridge ? bridge->uniqueid : "(Not bridged)", ast_channel_context(chan), diff --git a/main/manager.c b/main/manager.c index 2bd9c007c..6b1eda0ea 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4423,7 +4423,7 @@ static void generate_status(struct mansession *s, struct ast_channel *chan, char S_OR(ast_channel_dialed(chan)->number.str, ""), S_COR(effective_id.number.valid, effective_id.number.str, "<unknown>"), S_COR(effective_id.name.valid, effective_id.name.str, "<unknown>"), - ast_channel_whentohangup(chan)->tv_sec, + (long)ast_channel_whentohangup(chan)->tv_sec, bridge ? bridge->uniqueid : "", ast_channel_linkedid(chan), ast_channel_appl(chan), diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 7326adf65..8c3367b6f 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -1947,7 +1947,7 @@ 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(sec, sizeof(sec), "%lu", (unsigned long)payload->report->sender_information.ntp_timestamp.tv_sec); snprintf(usec, sizeof(usec), "%lu", (unsigned long)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, |