[asterisk-commits] dlee: trunk r397674 - in /trunk: ./ main/bucket.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Aug 26 16:32:13 2013
New Revision: 397674

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397674
Log:
Fixed bucket.c for systems where tv_usec is not an unsigned long.
........

Merged revisions 397673 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/bucket.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Aug 26 16:32:13 2013
@@ -1,1 +1,1 @@
-/branches/12:1-397614,397621,397628,397630,397643,397650
+/branches/12:1-397673

Modified: trunk/main/bucket.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bucket.c?view=diff&rev=397674&r1=397673&r2=397674
==============================================================================
--- trunk/main/bucket.c (original)
+++ trunk/main/bucket.c Mon Aug 26 16:32:13 2013
@@ -901,7 +901,7 @@
 static int timeval_struct2str(const void *obj, const intptr_t *args, char **buf)
 {
 	struct timeval *field = (struct timeval *)(obj + args[0]);
-	return (ast_asprintf(buf, "%lu.%06lu", field->tv_sec, field->tv_usec) < 0) ? -1 : 0;
+	return (ast_asprintf(buf, "%lu.%06lu", field->tv_sec, (unsigned long)field->tv_usec) < 0) ? -1 : 0;
 }
 
 /*! \brief Initialize bucket support */