diff options
| author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-19 19:51:16 +0000 |
|---|---|---|
| committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-19 19:51:16 +0000 |
| commit | 2488ed0f2c3447cc3f99cf1e497ffbca65faf294 (patch) | |
| tree | b95c079b1b24abb0e28e429d001078af2f027615 /main | |
| parent | 275b9c5aa6af688091d95f9c259fce1903e9be4f (diff) | |
As per kpfleming's comments to the prior commit, I'm reverting some of the changes here.
A comment was made in bug #13726
"3. The same mistake as in (2) is done in a few other places in the code that check for: #if defined(HAVE_ZAPTEL) || defined(HAVE_DAHDI)
Harmless, but still incorrect."
In the case of main/asterisk.c, this is not incorrect because without HAVE_ZAPTEL defined, we're missing
the include for ioctl and the namespace that defines DAHDI_TIMERCONFIG which is still required when
using Zaptel with the 1.4 branch.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@151167 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index c3191711d..cee50d677 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -76,16 +76,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI) #include <sys/ioctl.h> -#endif - -#if defined(HAVE_DAHDI) #include "asterisk/dahdi_compat.h" #endif -#if defined(HAVE_ZAPTEL) -#include <zaptel/zaptel.h> -#endif - #ifdef linux #include <sys/prctl.h> #ifdef HAVE_CAP @@ -2998,7 +2991,7 @@ int main(int argc, char *argv[]) int x = 160; fd = open("/dev/zap/timer", O_RDWR); if (fd >= 0) { - if (ioctl(fd, ZT_TIMERCONFIG, &x)) { + if (ioctl(fd, DAHDI_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); exit(1); } |