Merged revisions 107103 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r107103 | russell | 2008-03-10 12:13:34 -0500 (Mon, 10 Mar 2008) | 10 lines

Merged revisions 107102 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107102 | russell | 2008-03-10 12:13:17 -0500 (Mon, 10 Mar 2008) | 2 lines

Resolve a compiler warning.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Russell Bryant 17 years ago
parent 8d28aa58f6
commit 9d24a5691f

@ -1705,7 +1705,7 @@ static int generator_force(const void *data)
/* Called if generator doesn't have data */
void *tmp;
int res;
int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples);
int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples) = NULL;
struct ast_channel *chan = (struct ast_channel *)data;
ast_channel_lock(chan);

Loading…
Cancel
Save