[asterisk-commits] mmichelson: branch mmichelson/npm_fixes r188520 - in /team/mmichelson/npm_fix...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr 15 10:15:49 2009
New Revision: 188520

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188520
Log:
Resolve a conflict in chan_dahdi.c
I would say "resetting automerge" here, but it still is set...


Modified:
    team/mmichelson/npm_fixes/   (props changed)
    team/mmichelson/npm_fixes/channels/chan_dahdi.c

Propchange: team/mmichelson/npm_fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 15 10:15:49 2009
@@ -1,1 +1,1 @@
-/trunk:1-183558
+/trunk:1-188519

Modified: team/mmichelson/npm_fixes/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/team/mmichelson/npm_fixes/channels/chan_dahdi.c?view=diff&rev=188520&r1=188519&r2=188520
==============================================================================
--- team/mmichelson/npm_fixes/channels/chan_dahdi.c (original)
+++ team/mmichelson/npm_fixes/channels/chan_dahdi.c Wed Apr 15 10:15:49 2009
@@ -12255,7 +12255,9 @@
 #if defined(HAVE_PRI)
 static int pri_check_restart(struct dahdi_pri *pri)
 {
+#ifdef HAVE_PRI_SERVICE_MESSAGES
 tryanotherpos:
+#endif
 	do {
 		pri->resetpos++;
 	} while ((pri->resetpos < pri->numchans) &&
@@ -12263,6 +12265,7 @@
 		pri->pvts[pri->resetpos]->call ||
 		pri->pvts[pri->resetpos]->resetting));
 	if (pri->resetpos < pri->numchans) {
+#ifdef HAVE_PRI_SERVICE_MESSAGES
 		char db_chan_name[20], db_answer[5], state;
 		int why;
 
@@ -12280,6 +12283,7 @@
 				goto tryanotherpos;
 			}
 		}
+#endif
 
 		/* Mark the channel as resetting and restart it */
 		pri->pvts[pri->resetpos]->resetting = 1;