[asterisk-commits] branch oej/metermaids-trunk r16387 - in /team/oej/metermaids-trunk: ./ channe...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Mar 29 21:37:12 2006
New Revision: 16387

URL: http://svn.digium.com/view/asterisk?rev=16387&view=rev
Log:
Reset, resolve, automerge on

Modified:
    team/oej/metermaids-trunk/   (props changed)
    team/oej/metermaids-trunk/channels/chan_iax2.c
    team/oej/metermaids-trunk/res/res_features.c

Propchange: team/oej/metermaids-trunk/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/metermaids-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/metermaids-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/metermaids-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 29 21:37:12 2006
@@ -1,1 +1,1 @@
-/trunk:1-16324
+/trunk:1-16386

Modified: team/oej/metermaids-trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/channels/chan_iax2.c?rev=16387&r1=16386&r2=16387&view=diff
==============================================================================
--- team/oej/metermaids-trunk/channels/chan_iax2.c (original)
+++ team/oej/metermaids-trunk/channels/chan_iax2.c Wed Mar 29 21:37:12 2006
@@ -7973,7 +7973,7 @@
 		case IAX_IOSTATE_SCHEDREADY:
 			thread->actions++;
 			thread->iostate = IAX_IOSTATE_PROCESSING;
-#ifdef SCHED_MULTITHREAD
+#ifdef SCHED_MULTITHREADED
 			thread->schedfunc(thread->scheddata);
 #endif		
 			break;

Modified: team/oej/metermaids-trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/res/res_features.c?rev=16387&r1=16386&r2=16387&view=diff
==============================================================================
--- team/oej/metermaids-trunk/res/res_features.c (original)
+++ team/oej/metermaids-trunk/res/res_features.c Wed Mar 29 21:37:12 2006
@@ -2163,6 +2163,7 @@
 	parking_stop = 750;
 	parkfindnext = 0;
 	parkaddhints = 0;
+	adsipark = 0;
 
 	transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
 	featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;