diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-20 18:14:31 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-20 18:14:31 +0000 |
| commit | 9bf87d6ef0f763328be7f5756b64d754e4e37894 (patch) | |
| tree | 02654aa9821d603451480bc53d50d24a4d85f615 /apps/app_dial.c | |
| parent | 1610dd5a62dbe2b05db0a7a85f1919aa3515d2b7 (diff) | |
Merged revisions 253536-253538,253540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r253536 | russell | 2010-03-20 06:33:30 -0500 (Sat, 20 Mar 2010) | 4 lines
Use SHRT_MAX instead of MAXSHORT.
These changes fix build issues I had with this module on FreeBSD.
........
r253537 | russell | 2010-03-20 06:39:39 -0500 (Sat, 20 Mar 2010) | 2 lines
Resolve a compiler warning on FreeBSD.
........
r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines
Resolve compiler warnings on FreeBSD.
........
r253540 | russell | 2010-03-20 07:03:07 -0500 (Sat, 20 Mar 2010) | 2 lines
Resolve more compiler warnings on FreeBSD.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253626 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 228524cb6..3b9a61244 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1274,12 +1274,12 @@ static void end_bridge_callback(void *data) ast_channel_lock(chan); if (chan->cdr->answer.tv_sec) { - snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec); + snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec); pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf); } if (chan->cdr->start.tv_sec) { - snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec); + snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec); pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf); } ast_channel_unlock(chan); |