Changeset 66834b6

Timestamp:

Aug 21, 2005, 6:51:28 PM (19 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

162fd27

Parents:

e06e478

Message:

clarified fftw3 includes

Location:

src

Files:

• aubio_priv.h (modified) (1 diff)
• fft.c (modified) (1 diff)
• fft.h (modified) (1 diff)

src/aubio_priv.h

@@ -45 +45 @@
 #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
 

src/fft.c

@@ -35 +35 @@
 #if FFTW3F_SUPPORT
 #define real_t smpl_t
-#else                
+#else
 #define real_t lsmp_t
 #endif

src/fft.h

@@ -24 +24 @@
 #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>