shithub: aubio

Info  •  Files  •  Log  •  Branches

clarified fftw3 includes

--- a/src/aubio_priv.h

+++ b/src/aubio_priv.h

@@ -44,17 +44,13 @@

 #include <stdio.h>

 #endif

+/* must be included before fftw3.h */

 #if HAVE_COMPLEX_H

 #include <complex.h>

 #endif

-/*

-#include <complex.h>

-#include <fftw3.h>

-#define FFTW_TYPE fftwf_complex

-*/

+

 #if HAVE_FFTW3_H

 #include <fftw3.h>

-//#define FFTW_TYPE fftwf_complex

 #endif

 #if HAVE_MATH_H

--- a/src/fft.c

+++ b/src/fft.c

@@ -34,7 +34,7 @@

 #if FFTW3F_SUPPORT

 #define real_t smpl_t

-#else                

+#else

 #define real_t lsmp_t

 #endif

--- a/src/fft.h

+++ b/src/fft.h

@@ -23,10 +23,9 @@

 #ifndef FFT_H_

 #define FFT_H_

-/*

-// complex before fftw3 

-#include <complex.h>

-*/

+

+/* <complex.h> is not included here but only in aubio_priv.h, so that c++

+ * projects can still use their own complex definition. */

 #include <fftw3.h>

 #if FFTW3F_SUPPORT