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 /channels | |
| 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 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 60b6d2d9f..5bd2bd9f7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3668,7 +3668,7 @@ static int get_alarms(struct dahdi_pvt *p) { int res; struct dahdi_spaninfo zi; -#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS) +#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS) /* * The conditional compilation is needed only in asterisk-1.4 for * backward compatibility with old zaptel drivers that don't have @@ -3687,7 +3687,7 @@ static int get_alarms(struct dahdi_pvt *p) } if (zi.alarms != DAHDI_ALARM_NONE) return zi.alarms; -#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS) +#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS) /* No alarms on the span. Check for channel alarms. */ if ((res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_GET_PARAMS, ¶ms)) >= 0) return params.chan_alarms; |