aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-21 22:41:00 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-21 22:41:00 +0000
commitb1e41bac9040f4f98a2614706e05f585a6885473 (patch)
tree1c57719a4a4e08b50d81e191a564a1315c44c6da /res
parent5bbab86675b1a9bcc540aecd923363371b7b9b6e (diff)
Conflict kqueue on OS X, since it doesn't work there yet, anyway.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@271657 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_timing_kqueue.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_timing_kqueue.c b/res/res_timing_kqueue.c
index 34eed72b9..d6cb8336a 100644
--- a/res/res_timing_kqueue.c
+++ b/res/res_timing_kqueue.c
@@ -25,6 +25,7 @@
/*** MODULEINFO
<depend>kqueue</depend>
+ <conflict>launchd</conflict>
***/
#include "asterisk.h"