clarified fftw3 includes

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index 9240d60acd1913c568e35c0710240c310ced8e97..ee3977f1281f8f0f877f55ac97474b293265d293 100644 (file)
--- 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

diff --git a/src/fft.c b/src/fft.c
index d10cb835a41826f203132d1a60c4b3761c653e7f..fa8db8f1cfab34860b41c1933d224ef8d8e16d37 100644 (file)
--- 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
 

diff --git a/src/fft.h b/src/fft.h
index 03d53237c7a9962a58a51571df8dfc4fe5c51bee..591fd6c876df8741e478ef1779c737739e9de6ef 100644 (file)
--- 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