[asterisk-commits] jpeeler: branch 1.4 r263112 - in /branches/1.4/main: channel.c file.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu May 13 18:08:13 2010
New Revision: 263112

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=263112
Log:
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

Modified:
    branches/1.4/main/channel.c
    branches/1.4/main/file.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=263112&r1=263111&r2=263112
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Thu May 13 18:08:13 2010
@@ -37,7 +37,7 @@
 #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

Modified: branches/1.4/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/file.c?view=diff&rev=263112&r1=263111&r2=263112
==============================================================================
--- branches/1.4/main/file.c (original)
+++ branches/1.4/main/file.c Thu May 13 18:08:13 2010
@@ -53,6 +53,7 @@
 #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.