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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@274640 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 1f0a398bdc3019e05839091ab48713783268b3b6..0b14b92410fefaec78a65b2d06f1481cce6347cf 100644 (file)
--- 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")) {