make acc happy

The abi-compliance-checker grabs all the .h files it finds
and tries to compile them all. Even though some are not
appropriate for the architecture being run on. Being careful
with preprocessor protections avoids problems.

Gbp-Pq: Name make-acc-happy

diff --git a/include/volk/volk_neon_intrinsics.h b/include/volk/volk_neon_intrinsics.h
index 2b7bd58d82f435527c5c85620747eb306af673be..89f1532d502c9e4db4d4122fc3600df31b36089f 100644 (file)
--- a/include/volk/volk_neon_intrinsics.h
+++ b/include/volk/volk_neon_intrinsics.h
@@ -27,6 +27,7 @@
 
 #ifndef INCLUDE_VOLK_VOLK_NEON_INTRINSICS_H_
 #define INCLUDE_VOLK_VOLK_NEON_INTRINSICS_H_
+#ifdef LV_HAVE_NEON
 #include <arm_neon.h>
 
 
@@ -75,4 +76,5 @@ _vmultiply_complexq_f32(float32x4x2_t a_val, float32x4x2_t b_val)
     return c_val;
 }
 
+#endif /*LV_HAVE_NEON*/
 #endif /* INCLUDE_VOLK_VOLK_NEON_INTRINSICS_H_ */

diff --git a/kernels/volk/volk_32f_8u_polarbutterflypuppet_32f.h b/kernels/volk/volk_32f_8u_polarbutterflypuppet_32f.h
index 22002b1f8f50c67f641aadfedfbfe0bf2568ee18..8d7809034e80152f28c507fc413e8618699682fd 100644 (file)
--- a/kernels/volk/volk_32f_8u_polarbutterflypuppet_32f.h
+++ b/kernels/volk/volk_32f_8u_polarbutterflypuppet_32f.h
@@ -31,6 +31,7 @@
 #include <volk/volk_32f_8u_polarbutterfly_32f.h>
 #include <volk/volk_8u_x3_encodepolar_8u_x2.h>
 #include <volk/volk_8u_x3_encodepolarpuppet_8u.h>
+#include <volk/volk_8u_x2_encodeframepolar_8u.h>
 
 
 static inline void

diff --git a/kernels/volk/volk_8u_x2_encodeframepolar_8u.h b/kernels/volk/volk_8u_x2_encodeframepolar_8u.h
index 0eba64739b9c63250d08e9d0cb072c421e5b2df3..4be4f323eb43016c4ac134418f91b12de379f77d 100644 (file)
--- a/kernels/volk/volk_8u_x2_encodeframepolar_8u.h
+++ b/kernels/volk/volk_8u_x2_encodeframepolar_8u.h
@@ -58,8 +58,6 @@ encodepolar_single_stage(unsigned char* frame_ptr, const unsigned char* temp_ptr
   }
 }
 
-#ifdef LV_HAVE_GENERIC
-
 static inline void
 volk_8u_x2_encodeframepolar_8u_generic(unsigned char* frame, unsigned char* temp,
                                        unsigned int frame_size)
@@ -79,7 +77,6 @@ volk_8u_x2_encodeframepolar_8u_generic(unsigned char* frame, unsigned char* temp
     --stage;
   }
 }
-#endif /* LV_HAVE_GENERIC */
 
 #ifdef LV_HAVE_SSSE3
 #include <tmmintrin.h>