[asterisk-commits] russell: branch 1.6.0 r107104 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Mar 10 12:13:54 2008
New Revision: 107104

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

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=107104&r1=107103&r2=107104
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Mon Mar 10 12:13:54 2008
@@ -1705,7 +1705,7 @@
 	/* 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);