From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 13 May 2010 23:08:13 +0000 (+0000)
Subject: Fix internal timing not working with Zaptel
X-Git-Tag: 1.4.33-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a73ba6a7067f823c413e576b924ce213603925;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.4@263112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index eb8906386c..65c4284944 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 533c03a347..f576c853bd 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.