aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-13 23:08:13 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-13 23:08:13 +0000
commitd2397e65bc74ed89f518e6f8dcbac1a2d3cf5250 (patch)
treee206ec11933fc141a31d0de515f6b11c468d0cdd /main
parent62866e13de478ad1794dd283545aa2f85768a7bb (diff)
Fix internal timing not working with Zaptel
dahdi_compat.h was not being included in channel.c when used with Zaptel and wasn't in file.c at all. (closes issue #15250) Reported by: mneuhauser Patches: dahdi_compat.patch uploaded by mneuhauser (license 425) Tested by: IgorG git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@263112 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/channel.c2
-rw-r--r--main/file.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index eb8906386..65c428494 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <unistd.h>
#include <math.h>
-#if defined(HAVE_DAHDI)
+#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL)
#include <sys/ioctl.h>
#include "asterisk/dahdi_compat.h"
#endif
diff --git a/main/file.c b/main/file.c
index 533c03a34..f576c853b 100644
--- a/main/file.c
+++ b/main/file.c
@@ -53,6 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/linkedlists.h"
#include "asterisk/module.h"
#include "asterisk/astobj2.h"
+#include "asterisk/dahdi_compat.h"
/*
* The following variable controls the layout of localized sound files.