kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

build against the now-typedef-free dahdi/user.h

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-29 22:05:57 +00:00
parent b7aa2fb03c
commit 7b61edde36
8 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_dahdibarge.c
View File

@@ -102,7 +102,7 @@ static int careful_write(int fd, unsigned char *data, int len)
static int conf_run(struct ast_channel *chan, int confno, int confflags)
{
int fd;
DAHDI_CONFINFO ztc;
struct dahdi_confinfo ztc;
struct ast_frame *f;
struct ast_channel *c;
struct ast_frame fr;
@@ -114,8 +114,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags)
int retryzap;
int origfd;
int ret = -1;
DAHDI_BUFFERINFO bi;
struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;

4
apps/app_dahdiras.c
View File

@@ -156,7 +156,7 @@ static void run_ras(struct ast_channel *chan, char *args)
int status;
int res;
int signalled = 0;
DAHDI_BUFFERINFO savebi;
struct dahdi_bufferinfo savebi;
int x;
res = ioctl(chan->fds[0], DAHDI_GET_BUFINFO, &savebi);
@@ -214,7 +214,7 @@ static int exec(struct ast_channel *chan, void *data)
int res=-1;
char *args;
struct ast_module_user *u;
DAHDI_PARAMS ztp;
struct dahdi_params ztp;
if (!data)
data = "";

5
apps/app_dahdiscan.c
View File

@@ -101,7 +101,7 @@ static int careful_write(int fd, unsigned char *data, int len)
static int conf_run(struct ast_channel *chan, int confno, int confflags)
{
int fd;
DAHDI_CONFINFO ztc;
struct dahdi_confinfo ztc;
struct ast_frame *f;
struct ast_channel *c;
struct ast_frame fr;
@@ -115,8 +115,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags)
int ret = -1;
char input[4];
int ic=0;
DAHDI_BUFFERINFO bi;
struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;

2
apps/app_flash.c
View File

@@ -84,7 +84,7 @@ static int flash_exec(struct ast_channel *chan, void *data)
int res = -1;
int x;
struct ast_module_user *u;
DAHDI_PARAMS ztp;
struct dahdi_params ztp;
u = ast_module_user_add(chan);
if (!strcasecmp(chan->tech->type, dahdi_chan_name)) {
memset(&ztp, 0, sizeof(ztp));

6
apps/app_meetme.c
View File

@@ -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;