kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the 1.4 branch compile again broken with r150557 when using with Zaptel and not DAHDI

Browse Source 
(closes issue #13740)
 reported by: jmls
 patch by: bweschke



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@151100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
BJ Weschke
2008-10-19 19:07:05 +00:00
parent 4ac62c324b
commit 77b4928d8d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/asterisk.c
View File

@@ -74,11 +74,18 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <pwd.h> #include <pwd.h>
#include <sys/stat.h> #include <sys/stat.h>
#if defined(HAVE_DAHDI) #if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI)
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#if defined(HAVE_DAHDI)
#include "asterisk/dahdi_compat.h" #include "asterisk/dahdi_compat.h"
#endif #endif
#if defined(HAVE_ZAPTEL)
#include <zaptel/zaptel.h>
#endif
#ifdef linux #ifdef linux
#include <sys/prctl.h> #include <sys/prctl.h>
#ifdef HAVE_CAP #ifdef HAVE_CAP
@@ -2991,7 +2998,7 @@ int main(int argc, char *argv[])
int x = 160; int x = 160;
fd = open("/dev/zap/timer", O_RDWR); fd = open("/dev/zap/timer", O_RDWR);
if (fd >= 0) { if (fd >= 0) {
if (ioctl(fd, DAHDI_TIMERCONFIG, &x)) { if (ioctl(fd, ZT_TIMERCONFIG, &x)) {
ast_log(LOG_ERROR, "You have Zaptel built and drivers loaded, but the Zaptel timer test failed to set ZT_TIMERCONFIG to %d.\n", x); ast_log(LOG_ERROR, "You have Zaptel built and drivers loaded, but the Zaptel timer test failed to set ZT_TIMERCONFIG to %d.\n", x);
exit(1); exit(1);
} }