diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-01-10 16:27:29 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-01-10 16:27:29 -0500 |
| commit | edaaafc6f567e1e8b9af0674f7244e064706d282 (patch) | |
| tree | 6a03ad78334d5e5cb972c6b383bdbb58864ce9b7 /gr-fec | |
| parent | cbd21fccd6108ed2568508e72073ab1fc02604c7 (diff) | |
| parent | 43ab0789f6b2b92a703bc74475e4734ba2eb64a8 (diff) | |
Merge branch 'maint'
Conflicts:
volk/apps/volk_profile.cc
Diffstat (limited to 'gr-fec')
| -rw-r--r-- | gr-fec/lib/reed-solomon/decode_rs.c | 3 | ||||
| -rw-r--r-- | gr-fec/lib/reed-solomon/init_rs.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/gr-fec/lib/reed-solomon/decode_rs.c b/gr-fec/lib/reed-solomon/decode_rs.c index f9438cf266..9de22c87f5 100644 --- a/gr-fec/lib/reed-solomon/decode_rs.c +++ b/gr-fec/lib/reed-solomon/decode_rs.c @@ -9,7 +9,10 @@ #include <string.h> +#ifndef NULL #define NULL ((void *)0) +#endif + #define min(a,b) ((a) < (b) ? (a) : (b)) #ifdef FIXED diff --git a/gr-fec/lib/reed-solomon/init_rs.c b/gr-fec/lib/reed-solomon/init_rs.c index 4ec77cd723..f50592b55a 100644 --- a/gr-fec/lib/reed-solomon/init_rs.c +++ b/gr-fec/lib/reed-solomon/init_rs.c @@ -13,7 +13,9 @@ #include "char.h" #endif +#ifndef NULL #define NULL ((void *)0) +#endif void FREE_RS(void *p){ struct rs *rs = (struct rs *)p; |