diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-19 19:48:00 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-19 19:48:00 +0000 |
| commit | f2eeca3bed9fef3110ee1946504e3b382341d7fc (patch) | |
| tree | f32d0af75adb1ba287d025ed312df096422a910a /main/channel.c | |
| parent | a78774210ab8a62f2f675688748a02a227f67aef (diff) | |
(closes issue #13480)
Reported by: tzafrir
Replace a bunch of if defined checks for Zaptel/DAHDI through several new defines in dahdi_compat.h. This removes a lot of code duplication. Example from bug:
#ifdef HAVE_ZAPTEL
fd = open("/dev/zap/pseudo", O_RDWR);
#else
fd = open("/dev/dahdi/pseudo", O_RDWR);
#endif
is replaced with:
fd = open(DAHDI_FILE_PSEUDO, O_RDRW);
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@165991 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c index 6870d5338..34e31ab4a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -744,11 +744,7 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_ #ifdef HAVE_DAHDI -#ifdef HAVE_ZAPTEL - tmp->timingfd = open("/dev/zap/timer", O_RDWR); -#else - tmp->timingfd = open("/dev/dahdi/timer", O_RDWR); -#endif + tmp->timingfd = open(DAHDI_FILE_TIMER, O_RDWR); if (tmp->timingfd > -1) { /* Check if timing interface supports new |