From 225d1370af5c80f20f5be7b549b21e8ad45d782d Mon Sep 17 00:00:00 2001
From: "A. Maitland Bottoms" <bottoms@debian.org>
Date: Tue, 27 Mar 2018 22:02:59 -0400
Subject: [PATCH] [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
---
 include/volk/volk_neon_intrinsics.h                 | 2 ++
 kernels/volk/volk_32f_8u_polarbutterflypuppet_32f.h | 1 +
 kernels/volk/volk_8u_x2_encodeframepolar_8u.h       | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/volk/volk_neon_intrinsics.h b/include/volk/volk_neon_intrinsics.h
index 302bd30..bdd3089 100644
--- 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 6f97dd1..a6317bf 100644
--- 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 e8d980d..e652337 100644
--- 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>
-- 
2.30.2