From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 10 Mar 2008 17:13:34 +0000 (+0000)
Subject: Merged revisions 107102 via svnmerge from
X-Git-Tag: 1.6.0-beta7~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86fe5cc8006cddd86aa63dfb9305000ec7bc717f;p=thirdparty%2Fasterisk.git

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/trunk@107103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

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);