Another big chunk of changes from the RSW branch. Bunch of stuff from main/

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-10 19:35:50 +00:00
parent 3ffb39833b
commit b69c8e6ab5
22 changed files with 372 additions and 372 deletions

View File

@@ -551,16 +551,16 @@ void ast_jb_destroy(struct ast_channel *chan)
}
static long get_now(struct ast_jb *jb, struct timeval *tv)
static long get_now(struct ast_jb *jb, struct timeval *when)
{
struct timeval now;
if (!tv) {
tv = &now;
gettimeofday(tv, NULL);
if (!when) {
when = &now;
gettimeofday(when, NULL);
}
return ast_tvdiff_ms(*tv, jb->timebase);
return ast_tvdiff_ms(*when, jb->timebase);
}