summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-06-20 16:47:03 -0400
committerTom Rondeau <trondeau@vt.edu>2012-06-20 16:47:03 -0400
commitc316e3088e96bd9623420e2a0399fa772c96ef49 (patch)
treeb8f0bd4c6dd33dd7bbe27c2241dd029e33a3561e
parentf0d904d345192d9ac52829e3f64d91497616aceb (diff)
parenta0ffd48d73eda63d5fa3a9ded1dc0f34b116da9d (diff)
Merge branch 'master' into next
-rw-r--r--volk/include/volk/volk_32f_x2_dot_prod_32f_a.h2
-rw-r--r--volk/include/volk/volk_32f_x2_dot_prod_32f_u.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/volk/include/volk/volk_32f_x2_dot_prod_32f_a.h b/volk/include/volk/volk_32f_x2_dot_prod_32f_a.h
index c26fd5e7cc..067c33ad89 100644
--- a/volk/include/volk/volk_32f_x2_dot_prod_32f_a.h
+++ b/volk/include/volk/volk_32f_x2_dot_prod_32f_a.h
@@ -226,6 +226,8 @@ static inline void volk_32f_x2_dot_prod_32f_a_sse4_1(float * result, const float
#ifdef LV_HAVE_AVX
+#include <immintrin.h>
+
static inline void volk_32f_x2_dot_prod_32f_a_avx( float* result, const float* input, const float* taps, unsigned int num_points) {
unsigned int number = 0;
diff --git a/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h b/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h
index f9ae150942..ab33a25876 100644
--- a/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h
+++ b/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h
@@ -229,6 +229,8 @@ static inline void volk_32f_x2_dot_prod_32f_u_sse4_1(float * result, const float
#ifdef LV_HAVE_AVX
+#include <immintrin.h>
+
static inline void volk_32f_x2_dot_prod_32f_u_avx( float* result, const float* input, const float* taps, unsigned int num_points) {
unsigned int number = 0;