src/aubio_priv.h: include ipp headers from here

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index bc0ce9c..86dd0e7 100644 (file)
--- a/src/aubio_priv.h
+++ b/src/aubio_priv.h
@@ -123,7 +123,13 @@
 #endif /* HAVE_AUBIO_DOUBLE */
 #endif /* HAVE_ATLAS */
 
-#if !defined(HAVE_MEMCPY_HACKS) && !defined(HAVE_ACCELERATE) && !defined(HAVE_ATLAS)
+#if defined HAVE_INTEL_IPP
+#include <ippcore.h>
+#include <ippvm.h>
+#include <ipps.h>
+#endif
+
+#if !defined(HAVE_MEMCPY_HACKS) && !defined(HAVE_ACCELERATE) && !defined(HAVE_ATLAS) && !defined(HAVE_INTEL_IPP)
 #define HAVE_NOOPT 1
 #else
 #undef HAVE_NOOPT

diff --git a/src/cvec.c b/src/cvec.c
index e8a369a..bde7511 100644 (file)
--- a/src/cvec.c
+++ b/src/cvec.c
@@ -21,12 +21,6 @@
 #include "aubio_priv.h"
 #include "cvec.h"
 
-#if defined HAVE_INTEL_IPP
-#include <ippcore.h>
-#include <ippvm.h>
-#include <ipps.h>
-#endif
-
 cvec_t * new_cvec(uint_t length) {
   cvec_t * s;
   if ((sint_t)length <= 0) {

diff --git a/src/fvec.c b/src/fvec.c
index fdb5acb..6161a6a 100644 (file)
--- a/src/fvec.c
+++ b/src/fvec.c
@@ -21,12 +21,6 @@
 #include "aubio_priv.h"
 #include "fvec.h"
 
-#if defined HAVE_INTEL_IPP
-#include <ippcore.h>
-#include <ippvm.h>
-#include <ipps.h>
-#endif
-
 fvec_t * new_fvec(uint_t length) {
   fvec_t * s;
   if ((sint_t)length <= 0) {

diff --git a/src/mathutils.c b/src/mathutils.c
index 5e4244d..ef07d80 100644 (file)
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -25,12 +25,6 @@
 #include "mathutils.h"
 #include "musicutils.h"
 
-#if defined HAVE_INTEL_IPP
-#include <ippcore.h>
-#include <ippvm.h>
-#include <ipps.h>
-#endif
-
 /** Window types */
 typedef enum
 {