From 5892da801b30e4de9945c921375d2369ae23a35e Mon Sep 17 00:00:00 2001 From: kpfleming Date: Tue, 29 Jul 2008 22:29:11 +0000 Subject: Merged revisions 134260 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r134260 | kpfleming | 2008-07-29 17:22:13 -0500 (Tue, 29 Jul 2008) | 2 lines build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134283 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a38194967..13f61df00 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1517,7 +1517,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c char members[10] = ""; int dtmf, opt_waitmarked_timeout = 0; time_t timeout = 0; - DAHDI_BUFFERINFO bi; + struct dahdi_bufferinfo bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; char *exitkeys = NULL; -- cgit v1.2.3