diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-17 15:31:35 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-17 15:31:35 +0000 |
| commit | ec99b4621efa045e3256d876b4b03ac95b10bc7c (patch) | |
| tree | a7faeae48084aab872db13fe6cbec9a73b767772 /main | |
| parent | d1d3130af7844c62050667e915829a2d8402b989 (diff) | |
Correctly allow chan_dahdi to compile against older versions of Zaptel.
Don't always define HAVE_ZAPTEL_CHANALARMS (since we check if it's defined..)
Minor cleanup to make things clear.
(closes issue #13726)
Reported by: tzafrir
Patches:
dahdi_def.diff uploaded by tzafrir (license 46)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@150557 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 2 | ||||
| -rw-r--r-- | main/channel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index cee50d677..c7fe4b82e 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -74,7 +74,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <pwd.h> #include <sys/stat.h> -#if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI) +#if defined(HAVE_DAHDI) #include <sys/ioctl.h> #include "asterisk/dahdi_compat.h" #endif diff --git a/main/channel.c b/main/channel.c index 1f92ed97f..f23831041 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_ZAPTEL) || defined (HAVE_DAHDI) +#if defined(HAVE_DAHDI) #include <sys/ioctl.h> #include "asterisk/dahdi_compat.h" #endif |