diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-11 16:49:18 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-11 16:49:18 +0000 |
commit | 3397f0ba0d641065d78d0130da1bed1e9a05d22f (patch) | |
tree | 3a30e9998427a379fdc4d3e1060fce698bc13259 | |
parent | 1d3746c9b2e933617475e9c210b63f4b8e165dce (diff) |
Merged revisions 163085 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r163085 | mmichelson | 2008-12-11 10:47:34 -0600 (Thu, 11 Dec 2008) | 12 lines
Merged revisions 163084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r163084 | mmichelson | 2008-12-11 10:46:22 -0600 (Thu, 11 Dec 2008) | 4 lines
Revert this cast to long. Using time_t here causes build failures on a
FreeBSD 32-bit build.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@163086 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index e55b2f7bd..c7003fa5e 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3104,8 +3104,8 @@ static void queue_transfer_fixup(void *data, struct ast_channel *old_chan, struc struct ast_datastore *datastore; ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld", - new_chan->exten, new_chan->context, (time_t) (callstart - qe->start), - (time_t) (time(NULL) - callstart)); + new_chan->exten, new_chan->context, (long) (callstart - qe->start), + (long) (time(NULL) - callstart)); update_queue(qe->parent, member, callcompletedinsl); |