diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-23 11:54:16 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-23 11:54:16 -0700 |
| commit | c6c773757ef16aa8edac173a5b9bca270a658b9f (patch) | |
| tree | 7e3410eb08a81f2b4eec05ec42c359ad24c8d553 | |
| parent | dcee8e7416b849234bc09e1ae8a2acb1d3d21e3a (diff) | |
misc_next_branch_tweaks_to_build_on_osx_and_windows
| -rw-r--r-- | gr-digital/lib/digital_constellation.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation.h | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/fsm.cc | 4 | ||||
| -rw-r--r-- | gr-vocoder/lib/codec2/fft.c | 6 | ||||
| -rw-r--r-- | gr-vocoder/lib/codec2/kiss_fft.h | 1 |
5 files changed, 10 insertions, 7 deletions
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc index 2263bba0bc..d1f2184391 100644 --- a/gr-digital/lib/digital_constellation.cc +++ b/gr-digital/lib/digital_constellation.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gr_io_signature.h> #include <digital_constellation.h> #include <digital_metric_type.h> diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h index 4119b58031..d345ebc10e 100644 --- a/gr-digital/lib/digital_constellation.h +++ b/gr-digital/lib/digital_constellation.h @@ -81,7 +81,7 @@ public: unsigned int dimensionality() {return d_dimensionality;} unsigned int bits_per_symbol () { - return floor(log(d_constellation.size())/d_dimensionality/log(2)); + return floor(log(double(d_constellation.size()))/d_dimensionality/log(2.0)); } unsigned int arity () { diff --git a/gr-trellis/src/lib/fsm.cc b/gr-trellis/src/lib/fsm.cc index 889a3918b0..71e54b05ae 100644 --- a/gr-trellis/src/lib/fsm.cc +++ b/gr-trellis/src/lib/fsm.cc @@ -132,7 +132,7 @@ fsm::fsm(int k, int n, const std::vector<int> &G) for(int j=0;j<n;j++) { int mem = -1; if(G[i*n+j]!=0) - mem=(int)(log(G[i*n+j])/log(2.0)); + mem=(int)(log(double(G[i*n+j]))/log(2.0)); if(mem>max_mem_x[i]) max_mem_x[i]=mem; if(mem>max_mem) @@ -417,7 +417,7 @@ void fsm::generate_TM() done = find_es(s); attempts ++; } - if (done == false and d_S > 1) { + if (done == false && d_S > 1) { //throw std::runtime_error ("fsm::generate_TM(): FSM appears to be disconnected\n"); printf("fsm::generate_TM(): FSM appears to be disconnected\n"); printf("state %d cannot be reached from all other states\n",s); diff --git a/gr-vocoder/lib/codec2/fft.c b/gr-vocoder/lib/codec2/fft.c index 73c46c846f..a33e4d2c8a 100644 --- a/gr-vocoder/lib/codec2/fft.c +++ b/gr-vocoder/lib/codec2/fft.c @@ -72,18 +72,18 @@ initialize_fft (int n) void fft (float x[], int n, int isign) { + int isReverse = 0; + int c; + kiss_fft_cfg cfg; if (cfg_forward == NULL) { initialize_fft (n); } - int isReverse = 0; - int c; for (c = 0; c < n * 2; c += 2) { fin[c / 2].r = x[c]; fin[c / 2].i = -x[c + 1]; } - kiss_fft_cfg cfg; if (isign == -1) { cfg = cfg_reverse; diff --git a/gr-vocoder/lib/codec2/kiss_fft.h b/gr-vocoder/lib/codec2/kiss_fft.h index 20621d8b39..64c50f4aae 100644 --- a/gr-vocoder/lib/codec2/kiss_fft.h +++ b/gr-vocoder/lib/codec2/kiss_fft.h @@ -5,7 +5,6 @@ #include <stdio.h> #include <math.h> #include <string.h> -#include <malloc.h> #ifdef __cplusplus extern "C" { |