# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1458664004 25200
# Node ID e1c921322ba2ab9241123c59ddc0552fe410ab14
# Parent  8e5eca2c5a64fe933fe591489c70bd96ca8c24b4
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.

diff -r 8e5eca2c5a64 -r e1c921322ba2 liboctave/numeric/oct-fftw.cc
--- 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;