[svn-commits] russell: branch group/newcdr r203480 - in /team/group/newcdr: ./ channels/

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Jun 25 17:49:38 2009
New Revision: 203480

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203480
Log:
sync with trunk again

Modified:
    team/group/newcdr/   (props changed)
    team/group/newcdr/channels/chan_dahdi.c

Propchange: team/group/newcdr/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 25 17:49:38 2009
@@ -1,1 +1,1 @@
-/trunk:1-203477
+/trunk:1-203479

Modified: team/group/newcdr/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/channels/chan_dahdi.c?view=diff&rev=203480&r1=203479&r2=203480
==============================================================================
--- team/group/newcdr/channels/chan_dahdi.c (original)
+++ team/group/newcdr/channels/chan_dahdi.c Thu Jun 25 17:49:38 2009
@@ -69,6 +69,9 @@
 #endif
 
 #ifdef HAVE_SS7
+/* put this here until sig_ss7 comes along */
+#define NUM_DCHANS		4		/*!< No more than 4 d-channels */
+#define MAX_CHANNELS	672		/*!< No more than a DS3 per trunk group */
 #include <libss7.h>
 #endif
 
@@ -15915,7 +15918,7 @@
 static int load_module(void)
 {
 	int res;
-#if defined(HAVE_PRI)
+#if defined(HAVE_PRI) || defined (HAVE_SS7)
 	int y;
 #endif
 #if defined(HAVE_SS7)