diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 19:35:50 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 19:35:50 +0000 |
| commit | 8cb986b936ea0cee5af2dccf467fe1fc5b89414b (patch) | |
| tree | b4d1b3f66cf87177cb1c8a8ee596b6a9458f8f6c /main/abstract_jb.c | |
| parent | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (diff) | |
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137082 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/abstract_jb.c')
| -rw-r--r-- | main/abstract_jb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index 4d4704460..d5a4c7ffd 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -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); } |