[asterisk-commits] rmudgett: branch 1.6.2 r274640 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jul  7 13:34:27 2010
New Revision: 274640

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274640
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=274640&r1=274639&r2=274640
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Wed Jul  7 13:34:27 2010
@@ -16964,8 +16964,10 @@
 				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")) {