src/spectral/fft.{c,h}: move fftw3.h include inside fft.c

diff --git a/src/spectral/fft.c b/src/spectral/fft.c
index 9403d7f407a8f69680cdf793069c614d40d8a5d3..7814b3017f5d649294f96d5badd46b21daacfaa0 100644 (file)
--- a/src/spectral/fft.c
+++ b/src/spectral/fft.c
@@ -23,6 +23,31 @@
 #include "mathutils.h"
 #include "spectral/fft.h"
 
+/* note that <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>
+
+#ifdef HAVE_COMPLEX_H
+#if HAVE_FFTW3F
+/** fft data type with complex.h and fftw3f */
+#define FFTW_TYPE fftwf_complex
+#else
+/** fft data type with complex.h and fftw3 */
+#define FFTW_TYPE fftw_complex
+#endif
+#else
+#if HAVE_FFTW3F
+/** fft data type without complex.h and with fftw3f */
+#define FFTW_TYPE float
+#else
+/** fft data type without complex.h and with fftw */
+#define FFTW_TYPE double
+#endif
+#endif
+
+/** fft data type */
+typedef FFTW_TYPE fft_data_t;
+
 #if HAVE_FFTW3F
 #define fftw_malloc            fftwf_malloc
 #define fftw_free              fftwf_free

diff --git a/src/spectral/fft.h b/src/spectral/fft.h
index ae63c1c7e60ec21ad75bc524a327936b49f21c48..774e7513b57db32d4b3743f2ad24a2aca0823f9a 100644 (file)
--- a/src/spectral/fft.h
+++ b/src/spectral/fft.h
@@ -26,35 +26,10 @@
 #ifndef FFT_H_
 #define FFT_H_
 
-/* note that <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>
-
-#ifdef HAVE_COMPLEX_H
-#if HAVE_FFTW3F
-/** fft data type with complex.h and fftw3f */
-#define FFTW_TYPE fftwf_complex
-#else
-/** fft data type with complex.h and fftw3 */
-#define FFTW_TYPE fftw_complex
-#endif
-#else
-#if HAVE_FFTW3F
-/** fft data type without complex.h and with fftw3f */
-#define FFTW_TYPE float
-#else
-/** fft data type without complex.h and with fftw */
-#define FFTW_TYPE double
-#endif
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** fft data type */
-typedef FFTW_TYPE fft_data_t;
-
 /** FFT object
  
   This object computes forward and backward FFTs, using the complex type to