From: Richard Mudgett Date: Wed, 29 Aug 2012 22:40:18 +0000 (+0000) Subject: Fix compile errors. X-Git-Tag: 13.0.0-beta1~2600 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d7e0b9fd91cdb1139e8198f50df1b7e96af9fe82;p=thirdparty%2Fasterisk.git Fix compile errors. ........ Merged revisions 371950 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371951 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_meetme.c b/apps/app_meetme.c index b66ef03a2b..55099dd790 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1148,11 +1148,11 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu int res = -1; ast_test_suite_event_notify("CONFPLAY", "Channel: %s\r\n" - "Conference: %s\r\n" - "Marked: %d", - chan->name, - conf->confno, - conf->markedusers); + "Conference: %s\r\n" + "Marked: %d", + ast_channel_name(chan), + conf->confno, + conf->markedusers); if (!ast_check_hangup(chan)) res = ast_autoservice_start(chan); @@ -4607,7 +4607,7 @@ static int conf_exec(struct ast_channel *chan, const char *data) /* Prompt user for pin if pin is required */ ast_test_suite_event_notify("PLAYBACK", "Message: conf-getpin\r\n" "Channel: %s", - chan->name); + ast_channel_name(chan)); res = ast_app_getdata(chan, "conf-getpin", pin + strlen(pin), sizeof(pin) - 1 - strlen(pin), 0); } if (res >= 0) {