aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-29 22:05:57 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-29 22:05:57 +0000
commitba1cffa6923c291011c74215415e9df28c2f55a3 (patch)
treedf89ca74afd5bcfda6c971e7d1174c200ddb82e5 /apps/app_meetme.c
parent5d603c6ccf3f214050b2ee4464b6605de1f83072 (diff)
build against the now-typedef-free dahdi/user.h
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@134254 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r--apps/app_meetme.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5eabaa293..f79758477 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -742,7 +742,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu
static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount)
{
struct ast_conference *cnf;
- DAHDI_CONFINFO ztc = { 0, };
+ struct dahdi_confinfo ztc = { 0, };
int confno_int = 0;
AST_LIST_LOCK(&confs);
@@ -1373,7 +1373,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
struct ast_conf_user *user = NULL;
struct ast_conf_user *usr = NULL;
int fd;
- DAHDI_CONFINFO ztc, ztc_empty;
+ struct dahdi_confinfo ztc, ztc_empty;
struct ast_frame *f;
struct ast_channel *c;
struct ast_frame fr;
@@ -1406,7 +1406,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;
int setusercount = 0;