From ea86ed1263ec076f14681226c4f52dc1f70489c3 Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 13 Jan 2009 19:35:59 +0000 Subject: Merged revisions 168562 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines Merged revisions 168561 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines Revert unnecessary indications API change from rev 122314 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168565 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_skinny.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels/chan_skinny.c') diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 6ac36c9b5..56286dbe4 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3768,7 +3768,7 @@ static int skinny_transfer(struct skinny_subchannel *sub) { struct skinny_subchannel *xferor; /* the sub doing the transferring */ struct skinny_subchannel *xferee; /* the sub being transferred */ - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; if (ast_bridged_channel(sub->owner) || ast_bridged_channel(sub->related->owner)) { if (sub->xferor) { -- cgit v1.2.3