From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 18 Jan 2011 22:06:55 +0000 (+0000)
Subject: Merged revisions 302318 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1973
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cd1ac534be0aea8bc9f4d41f25d7233dd5e8bb4;p=thirdparty%2Fasterisk.git

Merged revisions 302318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302318 | rmudgett | 2011-01-18 16:04:14 -0600 (Tue, 18 Jan 2011) | 1 line

  Use the expanded format type instead of plain int.
........


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

diff --git a/main/features.c b/main/features.c
index 0cf42166da..4711fca369 100644
--- a/main/features.c
+++ b/main/features.c
@@ -743,7 +743,7 @@ static void check_goto_on_transfer(struct ast_channel *chan)
 
 static struct ast_channel *feature_request_and_dial(struct ast_channel *caller,
 	const char *caller_name, struct ast_channel *requestor,
-	struct ast_channel *transferee, const char *type, int format, void *data,
+	struct ast_channel *transferee, const char *type, format_t format, void *data,
 	int timeout, int *outstate, const char *language);
 
 /*!
@@ -2971,7 +2971,7 @@ static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer,
  */
 static struct ast_channel *feature_request_and_dial(struct ast_channel *caller,
 	const char *caller_name, struct ast_channel *requestor,
-	struct ast_channel *transferee, const char *type, int format, void *data,
+	struct ast_channel *transferee, const char *type, format_t format, void *data,
 	int timeout, int *outstate, const char *language)
 {
 	int state = 0;