dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 133038 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133038 | mmichelson | 2008-07-23 12:50:01 -0500 (Wed, 23 Jul 2008) | 7 lines

Small cleanup. Move the declaration of the DAHDI_SPANINFO
variable to the block where it is used. This allows one
less #ifdef HAVE_PRI to clutter things up.

Thanks to Tzafrir for pointing this out on #asterisk-dev


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133041 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mmichelson 2008-07-23 17:54:03 +00:00
parent 28947c57f5
commit 3cf9da7746
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_dahdi.c
View File

@ -8230,9 +8230,6 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
struct dahdi_pvt *tmp = NULL, *tmp2, *prev = NULL;
char fn[80];
struct dahdi_bufferinfo bi;
#ifdef HAVE_PRI
struct dahdi_spaninfo si;
#endif
int res;
int span = 0;
@ -8379,6 +8376,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
destroy_dahdi_pvt(&tmp);
return NULL;
} else {
struct dahdi_spaninfo si;
si.spanno = 0;
if (ioctl(tmp->subs[SUB_REAL].zfd,DAHDI_SPANSTAT,&si) == -1) {
ast_log(LOG_ERROR, "Unable to get span status: %s\n", strerror(errno));