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 0cf42166da0921b4a8b1b9fbb17d84f8968d9acf..4711fca3692186c48074026043083956a83b4402 100644 (file)
--- 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;