From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 20 Mar 2010 17:50:53 +0000 (+0000)
Subject: Merged revisions 253538 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66f578b71cb4113876fd35c2059a4adc3345dceb;p=thirdparty%2Fasterisk.git

Merged revisions 253538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines

  Resolve compiler warnings on FreeBSD.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index b587698ca9..38997f71f4 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1301,12 +1301,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);
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 0c0d49597e..d0e4289eff 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -885,12 +885,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);