From: Paul Brossier <piem@altern.org>
Date: Sun, 21 Aug 2005 16:51:28 +0000 (+0000)
Subject: clarified fftw3 includes
X-Git-Tag: 0.4.0-beta1~1367
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=66834b6405c4a4f0369fddd7d44826f82184ec68;p=aubio.git

clarified fftw3 includes
---

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index 9240d60a..ee3977f1 100644
--- 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 d10cb835..fa8db8f1 100644
--- 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 03d53237..591fd6c8 100644
--- 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