[svn-commits] mmichelson: branch mmichelson/res_timing_timerfd r157249 - /team/mmichelson/r...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Nov 17 12:11:50 2008
New Revision: 157249

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157249
Log:
Add some <conflict> lines to the res_timing_*
files so that only one may be selected from menuselect

Modified:
    team/mmichelson/res_timing_timerfd/res/res_timing_dahdi.c
    team/mmichelson/res_timing_timerfd/res/res_timing_pthread.c
    team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c

Modified: team/mmichelson/res_timing_timerfd/res/res_timing_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/res_timing_timerfd/res/res_timing_dahdi.c?view=diff&rev=157249&r1=157248&r2=157249
==============================================================================
--- team/mmichelson/res_timing_timerfd/res/res_timing_dahdi.c (original)
+++ team/mmichelson/res_timing_timerfd/res/res_timing_dahdi.c Mon Nov 17 12:11:50 2008
@@ -25,6 +25,8 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<conflict>res_timing_timerfd</conflict>
+	<conflict>res_timing_pthread</conflict>
  ***/
 
 #include "asterisk.h"

Modified: team/mmichelson/res_timing_timerfd/res/res_timing_pthread.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/res_timing_timerfd/res/res_timing_pthread.c?view=diff&rev=157249&r1=157248&r2=157249
==============================================================================
--- team/mmichelson/res_timing_timerfd/res/res_timing_pthread.c (original)
+++ team/mmichelson/res_timing_timerfd/res/res_timing_pthread.c Mon Nov 17 12:11:50 2008
@@ -23,6 +23,11 @@
  * \brief pthread timing interface 
  */
 
+/*** MODULEINFO
+	<conflict>res_timing_timerfd</conflict>
+	<conflict>res_timing_dahdi</conflict>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");

Modified: team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c?view=diff&rev=157249&r1=157248&r2=157249
==============================================================================
--- team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c (original)
+++ team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c Mon Nov 17 12:11:50 2008
@@ -25,6 +25,8 @@
 
 /*** MODULEINFO
 	<depend>timerfd</depend>
+	<conflict>res_timing_pthread</conflict>
+	<conflict>res_timing_dahdi</conflict>
  ***/
 
 #include "asterisk.h"