summaryrefslogtreecommitdiff
path: root/volk/include
diff options
context:
space:
mode:
authorJohnathan Corgan2012-07-17 15:37:55 -0700
committerJohnathan Corgan2012-07-17 15:37:55 -0700
commit7c8347ca47b51ddaef03ab1804a3d37716870643 (patch)
tree5aa98c2e8821538235a3ff4ed2f74f8b521951f4 /volk/include
parent3d868e178994f2e147bbee2c26c09fe283ab6992 (diff)
parentcf8b2a8ff57ff6d3fd4b78a897854cc9a6f49fe1 (diff)
downloadgnuradio-7c8347ca47b51ddaef03ab1804a3d37716870643.tar.gz
gnuradio-7c8347ca47b51ddaef03ab1804a3d37716870643.tar.bz2
gnuradio-7c8347ca47b51ddaef03ab1804a3d37716870643.zip
Merge remote branch 'jblum/volk_mmx_fix'
Diffstat (limited to 'volk/include')
-rw-r--r--volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h b/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h
index 940aa5de7..1f6554af8 100644
--- a/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h
+++ b/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h
@@ -37,7 +37,7 @@ static inline void volk_16i_32fc_dot_prod_32fc_a_generic(lv_32fc_t* result, cons
#endif /*LV_HAVE_GENERIC*/
-#ifdef LV_HAVE_SSE
+#if LV_HAVE_SSE && LV_HAVE_MMX
static inline void volk_16i_32fc_dot_prod_32fc_a_sse( lv_32fc_t* result, const short* input, const lv_32fc_t* taps, unsigned int num_points) {
@@ -116,7 +116,7 @@ static inline void volk_16i_32fc_dot_prod_32fc_a_sse( lv_32fc_t* result, const
*result = *(lv_32fc_t*)(&res[0]);
}
-#endif /*LV_HAVE_SSE*/
+#endif /*LV_HAVE_SSE && LV_HAVE_MMX*/
#endif /*INCLUDED_volk_16i_32fc_dot_prod_32fc_a_H*/