[asterisk-commits] russell: branch group/sip_session_timers r93376 - in /team/group/sip_session_...

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Dec 17 16:10:54 2007
New Revision: 93376

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93376
Log:
resolve, reset

Modified:
    team/group/sip_session_timers/   (props changed)
    team/group/sip_session_timers/apps/app_queue.c
    team/group/sip_session_timers/channels/chan_iax2.c
    team/group/sip_session_timers/channels/chan_mgcp.c
    team/group/sip_session_timers/channels/chan_sip.c
    team/group/sip_session_timers/channels/chan_zap.c
    team/group/sip_session_timers/include/asterisk/time.h

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 17 16:10:54 2007
@@ -1,1 +1,1 @@
-/trunk:1-93307
+/trunk:1-93375

Modified: team/group/sip_session_timers/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/apps/app_queue.c?view=diff&rev=93376&r1=93375&r2=93376
==============================================================================
--- team/group/sip_session_timers/apps/app_queue.c (original)
+++ team/group/sip_session_timers/apps/app_queue.c Mon Dec 17 16:10:54 2007
@@ -55,6 +55,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+        <depend>res_monitor</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/group/sip_session_timers/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_iax2.c?view=diff&rev=93376&r1=93375&r2=93376
==============================================================================
--- team/group/sip_session_timers/channels/chan_iax2.c (original)
+++ team/group/sip_session_timers/channels/chan_iax2.c Mon Dec 17 16:10:54 2007
@@ -31,6 +31,7 @@
 /*** MODULEINFO
 	<use>zaptel</use>
 	<use>crypto</use>
+        <depend>res_features</depend>
  ***/
 
 #include "asterisk.h"

Modified: team/group/sip_session_timers/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_mgcp.c?view=diff&rev=93376&r1=93375&r2=93376
==============================================================================
--- team/group/sip_session_timers/channels/chan_mgcp.c (original)
+++ team/group/sip_session_timers/channels/chan_mgcp.c Mon Dec 17 16:10:54 2007
@@ -27,6 +27,9 @@
  *
  * \ingroup channel_drivers
  */
+/*** MODULEINFO
+        <depend>res_features</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/group/sip_session_timers/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_sip.c?view=diff&rev=93376&r1=93375&r2=93376
==============================================================================
--- team/group/sip_session_timers/channels/chan_sip.c (original)
+++ team/group/sip_session_timers/channels/chan_sip.c Mon Dec 17 16:10:54 2007
@@ -82,6 +82,9 @@
  * the sip_hangup() function
  */
 
+/*** MODULEINFO
+        <depend>res_features</depend>
+ ***/
 
 /*!  \page sip_session_timers SIP Session Timers in Asterisk Chan_sip
 

Modified: team/group/sip_session_timers/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_zap.c?view=diff&rev=93376&r1=93375&r2=93376
==============================================================================
--- team/group/sip_session_timers/channels/chan_zap.c (original)
+++ team/group/sip_session_timers/channels/chan_zap.c Mon Dec 17 16:10:54 2007
@@ -42,6 +42,7 @@
 	<depend>zaptel_vldtmf</depend>
 	<depend>zaptel</depend>
 	<depend>tonezone</depend>
+	<depend>res_features</depend>
 	<use>pri</use>
 	<use>ss7</use>
  ***/

Modified: team/group/sip_session_timers/include/asterisk/time.h
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/include/asterisk/time.h?view=diff&rev=93376&r1=93375&r2=93376
==============================================================================
--- team/group/sip_session_timers/include/asterisk/time.h (original)
+++ team/group/sip_session_timers/include/asterisk/time.h Mon Dec 17 16:10:54 2007
@@ -38,8 +38,8 @@
 
 /*!
  * \brief Computes the difference (in milliseconds) between two \c struct \c timeval instances.
- * \param end the beginning of the time period
- * \param start the end of the time period
+ * \param end end of the time period
+ * \param start beginning of the time period
  * \return the difference in milliseconds
  */
 AST_INLINE_API(