mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-02 19:16:15 +00:00
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:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user