diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-23 15:32:03 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-23 15:32:03 +0000 |
| commit | 39d34cf50e3dd65ba61c579b77495311c6737e43 (patch) | |
| tree | 830a32650b7a7f2ea36ad8acc3b3e9528b0f26ac /zaptel.c | |
| parent | 32474245aaab39b88fd2ff7b03356bedbb0ad3ac (diff) | |
Merged revisions 1921 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1921 | kpfleming | 2007-01-23 09:29:28 -0600 (Tue, 23 Jan 2007) | 10 lines
Merged revisions 1920 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1920 | kpfleming | 2007-01-23 09:25:42 -0600 (Tue, 23 Jan 2007) | 2 lines
clean up various compiler warnings
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1922 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel.c')
| -rw-r--r-- | zaptel.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -222,7 +222,8 @@ static struct class_simple *zap_class = NULL; static int deftaps = 64; -static +#if !defined(LINUX26) +static __u16 fcstab[256] = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, @@ -258,6 +259,7 @@ __u16 fcstab[256] = 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; +#endif static int debug; @@ -6595,7 +6597,7 @@ static void __zt_getempty(struct zt_chan *ms, unsigned char *buf) static void __zt_receive_chunk(struct zt_chan *chan, unsigned char *buf) { /* Receive chunk of audio -- called with chan->lock held */ - char waste[ZT_CHUNKSIZE]; + unsigned char waste[ZT_CHUNKSIZE]; if (!buf) { memset(waste, ZT_LIN2X(0, chan), sizeof(waste)); |