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 3f121a82b409c0e0b5a13d1b937ca3a71c6af58d..ef42deae218dabd546d974021ff981984dcefc5f 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>
 
 static inline float32x4_t
@@ -119,4 +120,5 @@ _vlog2q_f32(float32x4_t aval)
   return log2_approx;
 }
 
+#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 028f27110f1c2d7b7e02d14f37688f2aa1da75f0..9ff69cfd074ee09dd652d6d3dbef9b4ccf14e946 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 6a605c64295829ecbaea24e2f6f92b3c15639431..ff729a83938996133d62211763afefd786a4fb07 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>