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 eb8906386cc0e0bcb215d9170d384688dc1c24cf..65c42849441655dafa4a7af94f2a45834a662904 100644 (file)
--- 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 533c03a347fc7da21c1d83767a1ca92ee5b754eb..f576c853bd5fb22bc32941b3a93df4d75e4b0d05 100644 (file)
--- 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.