aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-20 18:14:31 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-20 18:14:31 +0000
commit9bf87d6ef0f763328be7f5756b64d754e4e37894 (patch)
tree02654aa9821d603451480bc53d50d24a4d85f615 /channels
parent1610dd5a62dbe2b05db0a7a85f1919aa3515d2b7 (diff)
Merged revisions 253536-253538,253540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r253536 | russell | 2010-03-20 06:33:30 -0500 (Sat, 20 Mar 2010) | 4 lines Use SHRT_MAX instead of MAXSHORT. These changes fix build issues I had with this module on FreeBSD. ........ r253537 | russell | 2010-03-20 06:39:39 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve a compiler warning on FreeBSD. ........ r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve compiler warnings on FreeBSD. ........ r253540 | russell | 2010-03-20 07:03:07 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve more compiler warnings on FreeBSD. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253626 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_dahdi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index a1249edc1..e5adb979b 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -49,7 +49,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)
#include <pthread.h>
#include <signal.h>
#else