[PATCH 2/6] 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 302bd30be8161081fb3d358f4e4e94ffff306e09..bdd308926acf016e321c1b7df2a0273f1af2113d 100644 (file)
--- a/include/volk/volk_neon_intrinsics.h
+++ b/include/volk/volk_neon_intrinsics.h
@@ -79,6 +79,7 @@
 
 #ifndef INCLUDE_VOLK_VOLK_NEON_INTRINSICS_H_
 #define INCLUDE_VOLK_VOLK_NEON_INTRINSICS_H_
+#ifdef LV_HAVE_NEON
 #include <arm_neon.h>
 
 
@@ -278,4 +279,5 @@ static inline float32x4_t _vtanq_f32(float32x4_t x)
 }
 
 
+#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 6f97dd1fcfc7532fb803bc8b8f3f3e3145fe024a..a6317bfe286cf37392bf6024ad52ed0af452a8ca 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 sanitize_bytes(unsigned char* u, const int elements)

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