w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a merge issue in init_rs.c.

Browse Source
This commit is contained in:
Joe Taylor 2021-04-09 09:50:25 -04:00
parent 96e8908866
commit faca845d89
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
map65/libm65/init_rs.c
View File

@ -34,12 +34,8 @@ void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned fcr,unsigned pri
struct rs *rs; struct rs *rs;
int i, j, sr,root,iprim; int i, j, sr,root,iprim;
<<<<<<< HEAD:lib/init_rs.c
/* Check parameter ranges */ /* Check parameter ranges */
if(symsize < 0 || symsize > (int)(8*sizeof(DTYPE))) if(symsize < 0 || symsize > (int)(8*sizeof(DTYPE)))
=======
if(symsize > 8*sizeof(DTYPE))
>>>>>>> 280c8344cd80339491e9bad1dcc4ac9a1e5f684e:map65/libm65/init_rs.c
return NULL; /* Need version with ints rather than chars */ return NULL; /* Need version with ints rather than chars */
if(fcr >= (1<<symsize)) if(fcr >= (1<<symsize))