From 9d24a5691f4faaf38ae90541eb36e494e4380bd2 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 10 Mar 2008 17:13:54 +0000 Subject: [PATCH] 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 --- main/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index e1569aec5d..20f432682b 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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);