]>
Commit | Line | Data |
---|---|---|
b3826e10 | 1 | --- branches/1.4/channels/chan_dahdi.c 2008/10/08 22:22:09 147681 |
2 | +++ branches/1.4/channels/chan_dahdi.c 2008/10/17 15:31:35 150557 | |
3 | @@ -3668,7 +3668,7 @@ | |
4 | { | |
5 | int res; | |
6 | struct dahdi_spaninfo zi; | |
7 | -#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS) | |
8 | +#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS) | |
9 | /* | |
10 | * The conditional compilation is needed only in asterisk-1.4 for | |
11 | * backward compatibility with old zaptel drivers that don't have | |
12 | @@ -3687,7 +3687,7 @@ | |
13 | } | |
14 | if (zi.alarms != DAHDI_ALARM_NONE) | |
15 | return zi.alarms; | |
16 | -#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS) | |
17 | +#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS) | |
18 | /* No alarms on the span. Check for channel alarms. */ | |
19 | if ((res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_GET_PARAMS, ¶ms)) >= 0) | |
20 | return params.chan_alarms; |