diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:58:23 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:58:23 +0000 |
| commit | a3fe43fbdc89aa51e266360dc93ed4a4445bebdb (patch) | |
| tree | caff43dd70af497468c3bb248d26b6c25727ae7f /main | |
| parent | 08a88aab159b99588bf705e3e325813c07ae5d0f (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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433269 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 85ac35f48..70b693b0d 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1645,7 +1645,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 c71f8779f..a2aae9a8d 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4464,7 +4464,7 @@ static int action_status(struct mansession *s, const struct message *m) S_OR(ast_channel_dialed(chan)->number.str, ""), S_COR(ast_channel_connected_effective_id(chan).number.valid, ast_channel_connected_effective_id(chan).number.str, "<unknown>"), S_COR(ast_channel_connected_effective_id(chan).name.valid, ast_channel_connected_effective_id(chan).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 a86f742a1..fbe1382bd 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, |