diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-07 18:34:27 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-07 18:34:27 +0000 |
| commit | 37e792adf62d1c48c5c9175240149089a540eee3 (patch) | |
| tree | 7e050c019945466bd81f1d5ecdc5b67782c46cfe /channels | |
| parent | 2f0b554ab49f92fb94711fd1a3ccb58cabf8b5a7 (diff) | |
Merged revisions 274639 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r274639 | rmudgett | 2010-07-07 13:32:35 -0500 (Wed, 07 Jul 2010) | 1 line
Add missing conditional around chan_dahdi mfcr2_skip_category config parameter.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@274640 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 1f0a398bd..0b14b9241 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -16964,8 +16964,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct confp->mfcr2.forced_release = ast_true(v->value) ? 1 : 0; } else if (!strcasecmp(v->name, "mfcr2_immediate_accept")) { confp->mfcr2.immediate_accept = ast_true(v->value) ? 1 : 0; +#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1 } else if (!strcasecmp(v->name, "mfcr2_skip_category")) { confp->mfcr2.skip_category_request = ast_true(v->value) ? 1 : 0; +#endif } else if (!strcasecmp(v->name, "mfcr2_call_files")) { confp->mfcr2.call_files = ast_true(v->value) ? 1 : 0; } else if (!strcasecmp(v->name, "mfcr2_max_ani")) { |