dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 51274 via svnmerge from 

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

........
r51274 | dhubbard | 2007-01-18 18:17:32 -0600 (Thu, 18 Jan 2007) | 3 lines

chan_zap compiles without libpri after committing 7877 patch


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@51275 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
dhubbard 2007-01-19 00:28:25 +00:00
parent a8ff2acd32
commit 1527f6b883
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_zap.c
View File

@ -642,7 +642,9 @@ static struct zt_pvt {
*/
struct zt_chan_conf {
struct zt_pvt chan;
#ifdef HAVE_PRI
struct zt_pri pri;
#endif
ZT_PARAMS timing;
char smdi_port[SMDI_MAX_FILENAME_LEN];
@ -654,8 +656,8 @@ static struct zt_chan_conf zt_chan_conf_default(void) {
* to 0 or equivalent
*/
struct zt_chan_conf conf = {
.pri = {
#ifdef HAVE_PRI
.pri = {
.nsf = PRI_NSF_NONE,
.switchtype = PRI_SWITCH_NI2,
.dialplan = PRI_NATIONAL_ISDN + 1,
@ -672,8 +674,8 @@ static struct zt_chan_conf zt_chan_conf_default(void) {
.unknownprefix = "",
.resetinterval = 3600
#endif
},
#endif
.chan = {
.context = "default",
.cid_num = "",
@ -12541,7 +12543,8 @@ static int setup_zap(int reload)
if (!ast_strlen_zero(chans)) {
if (memcpy(&conf, &base_conf, sizeof(conf)) == NULL) {
ast_log(LOG_ERROR, "Not enough memory for conf copy\n");
exit -1;
ast_config_destroy(cfg);
return -1;
}
process_zap(&conf, ast_variable_browse(cfg, cat), reload, 0);
}