Mercurial > hg > octave-lyh
diff liboctave/fCNDArray.cc @ 9523:0ce82753dd72
more configure changes for libraries
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 13 Aug 2009 18:20:31 -0400 |
| parents | 9f870f73ab7d |
| children | 1beb23d2b892 |
line wrap: on
line diff
--- a/liboctave/fCNDArray.cc +++ b/liboctave/fCNDArray.cc @@ -31,30 +31,15 @@ #include <vector> #include "Array-util.h" +#include "f77-fcn.h" #include "fCNDArray.h" -#include "mx-base.h" -#include "f77-fcn.h" #include "functor.h" #include "lo-ieee.h" #include "lo-mappers.h" -#include "oct-locbuf.h" +#include "mx-base.h" #include "mx-op-defs.h" - -#if defined (HAVE_FFTW3) #include "oct-fftw.h" -#else -extern "C" -{ - F77_RET_T - F77_FUNC (cffti, CFFTI) (const octave_idx_type&, FloatComplex*); - - F77_RET_T - F77_FUNC (cfftf, CFFTF) (const octave_idx_type&, FloatComplex*, FloatComplex*); - - F77_RET_T - F77_FUNC (cfftb, CFFTB) (const octave_idx_type&, FloatComplex*, FloatComplex*); -} -#endif +#include "oct-locbuf.h" FloatComplexNDArray::FloatComplexNDArray (const charNDArray& a) : MArrayN<FloatComplex> (a.dims ()) @@ -64,7 +49,8 @@ xelem (i) = static_cast<unsigned char> (a(i)); } -#if defined (HAVE_FFTW3) +#if defined (HAVE_FFTW) + FloatComplexNDArray FloatComplexNDArray::fourier (int dim) const { @@ -198,6 +184,19 @@ } #else + +extern "C" +{ + F77_RET_T + F77_FUNC (cffti, CFFTI) (const octave_idx_type&, FloatComplex*); + + F77_RET_T + F77_FUNC (cfftf, CFFTF) (const octave_idx_type&, FloatComplex*, FloatComplex*); + + F77_RET_T + F77_FUNC (cfftb, CFFTB) (const octave_idx_type&, FloatComplex*, FloatComplex*); +} + FloatComplexNDArray FloatComplexNDArray::fourier (int dim) const {