[asterisk-commits] dlee: branch dlee/stasis-cache-split r394159 - in /team/dlee/stasis-cache-spl...

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Jul 11 16:01:28 2013
New Revision: 394159

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394159
Log:
Merged revisions 394156-394158 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/dlee/stasis-cache-split/   (props changed)
    team/dlee/stasis-cache-split/channels/chan_skinny.c
    team/dlee/stasis-cache-split/include/asterisk/bridging_technology.h

Propchange: team/dlee/stasis-cache-split/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 11 16:01:28 2013
@@ -1,1 +1,1 @@
-/trunk:1-394154
+/trunk:1-394158

Modified: team/dlee/stasis-cache-split/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/channels/chan_skinny.c?view=diff&rev=394159&r1=394158&r2=394159
==============================================================================
--- team/dlee/stasis-cache-split/channels/chan_skinny.c (original)
+++ team/dlee/stasis-cache-split/channels/chan_skinny.c Thu Jul 11 16:01:28 2013
@@ -8658,7 +8658,7 @@
 	struct skinny_line *l;
 	struct skinny_subchannel *sub;
 	struct ast_context *con;
-	int tempthread;
+	pthread_t tempthread;
 
 	ast_rtp_glue_unregister(&skinny_rtp_glue);
 	ast_channel_unregister(&skinny_tech);

Modified: team/dlee/stasis-cache-split/include/asterisk/bridging_technology.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/include/asterisk/bridging_technology.h?view=diff&rev=394159&r1=394158&r2=394159
==============================================================================
--- team/dlee/stasis-cache-split/include/asterisk/bridging_technology.h (original)
+++ team/dlee/stasis-cache-split/include/asterisk/bridging_technology.h Thu Jul 11 16:01:28 2013
@@ -131,7 +131,7 @@
 	 *
 	 * \note On entry, bridge is already locked.
 	 */
-	int (*write)(struct ast_bridge *bridge, struct ast_bridge_channel *bridged_channel, struct ast_frame *frame);
+	int (*write)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame);
 	/*! Formats that the bridge technology supports */
 	struct ast_format_cap *format_capabilities;
 	/*! TRUE if the bridge technology is currently suspended. */