diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-13 12:04:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-13 12:04:37 -0700 |
| commit | b629e3faa419a2fbd1d4f0a1563a28748dfc9403 (patch) | |
| tree | bc6928bfc05e58f2d6b402e576c4c36e6160d232 /gr-fft | |
| parent | 81cd7830a2fc87711d6faa894dddd716903813c3 (diff) | |
| parent | 851d7a27f09c27f84ba7f9ad19c3ba835c61af7f (diff) | |
Merge branch 'next' into python3
Conflicts:
CMakeLists.txt
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/lib/fft.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc index 3b6d05c383..871ad9bcaa 100644 --- a/gr-fft/lib/fft.cc +++ b/gr-fft/lib/fft.cc @@ -26,7 +26,7 @@ #include <volk/volk.h> #include <fftw3.h> -#ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom +#ifdef _WIN32 //http://www.fftw.org/install/windows.html#DLLwisdom static void my_fftw_write_char(char c, void *f) { fputc(c, (FILE *) f); } #define fftw_export_wisdom_to_file(f) fftw_export_wisdom(my_fftw_write_char, (void*) (f)) #define fftwf_export_wisdom_to_file(f) fftwf_export_wisdom(my_fftw_write_char, (void*) (f)) @@ -40,7 +40,7 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); } #include <io.h> #define O_NOCTTY 0 #define O_NONBLOCK 0 -#endif //_MSC_VER +#endif //_WIN32 #include <stdlib.h> #include <string.h> |