diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-19 16:00:40 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-19 16:00:40 +0000 |
commit | be211e93b85bec7ec67581d7138a2fcb2a196d50 (patch) | |
tree | 6da10b331e375332c283659efdd9c287c3a9f39b | |
parent | 6dbcbe8b1ef7fecd79510b3d2c0894792f941a11 (diff) |
Make sure s is initialized, make FAX_DETECT + OLD_DSP_ROUTINES build
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3479 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | channels/chan_zap.c | 2 | ||||
-rwxr-xr-x | dsp.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index e997171bb..298708fb2 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1457,7 +1457,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) int x, res, index; char *c, *n, *l; #ifdef ZAPATA_PRI - char *s; + char *s=NULL; #endif char callerid[256]; char dest[256]; /* must be same length as p->dialdest */ @@ -132,9 +132,7 @@ static struct progress { #define DTMF_RELATIVE_PEAK_COL 6.3 /* 8dB */ #define DTMF_2ND_HARMONIC_ROW ((digitmode & DSP_DIGITMODE_RELAXDTMF) ? 1.7 : 2.5) /* 4dB normal */ #define DTMF_2ND_HARMONIC_COL 63.1 /* 18dB */ -#ifndef OLD_DSP_ROUTINES #define DTMF_TO_TOTAL_ENERGY 42.0 -#endif #ifdef OLD_DSP_ROUTINES #define MF_THRESHOLD 8.0e7 |