[svn-commits] mmichelson: branch 1.6.1 r163087 - in /branches/1.6.1: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Dec 11 10:49:47 2008
New Revision: 163087

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163087
Log:
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.


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_queue.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=163087&r1=163086&r2=163087
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Thu Dec 11 10:49:47 2008
@@ -3155,8 +3155,8 @@
 	struct ast_datastore *datastore;
 
 	ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld|%d",
-				new_chan->exten, new_chan->context, (time_t) (callstart - qe->start),
-				(time_t) (time(NULL) - callstart), qe->opos);
+				new_chan->exten, new_chan->context, (long) (callstart - qe->start),
+				(long) (time(NULL) - callstart), qe->opos);
 
 	update_queue(qe->parent, member, callcompletedinsl);