[asterisk-commits] rmudgett: trunk r302319 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Jan 18 16:06:55 2011
New Revision: 302319

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302319
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=302319&r1=302318&r2=302319
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Jan 18 16:06:55 2011
@@ -743,7 +743,7 @@
 
 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 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;