Mercurial > octave

changeset 21520:e1c921322ba2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix configuration conditions in oct-fftw.cc * oct-fftw.cc: Include "nproc.h" if either HAVE_FFTW3_THREADS or HAVE_FFTW3F_THREADS are defined. (octave_fftw_planner::threads): Use HAVE_FFTW3_THREADS in conditional.
author Mike Miller <mtmiller@octave.org>
date Tue, 22 Mar 2016 09:26:44 -0700
parents 8e5eca2c5a64
children 02cbd95095cc
files liboctave/numeric/oct-fftw.cc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/oct-fftw.cc	Mon Mar 21 23:55:38 2016 +0000
+++ b/liboctave/numeric/oct-fftw.cc	Tue Mar 22 09:26:44 2016 -0700
@@ -39,7 +39,7 @@
 #include "oct-locbuf.h"
 #include "singleton-cleanup.h"
 
-#if defined (HAVE_FFTW3_THREADS)
+#if defined (HAVE_FFTW3_THREADS) || defined (HAVE_FFTW3F_THREADS)
 #  include "nproc.h"
 #endif
 
@@ -128,7 +128,7 @@
 void
 octave_fftw_planner::threads (int nt)
 {
-#if defined (HAVE_FFTW3F_THREADS)
+#if defined (HAVE_FFTW3_THREADS)
   if (instance_ok () && nt != threads ())
     {
       instance->nthreads = nt;