From bffb2af2ff21d2ab2747fb9aae092dd68b509bbd Mon Sep 17 00:00:00 2001
From: nihuini <nihuini@tencent.com>
Date: Tue, 12 Nov 2019 19:18:58 +0800
Subject: [PATCH] fix build on armv7 without neon

---
 src/layer/arm/innerproduct_arm.cpp | 2 +-
 src/layer/arm/neon_activation.h    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layer/arm/innerproduct_arm.cpp b/src/layer/arm/innerproduct_arm.cpp
index 41161b240..2f325b00d 100644
--- a/src/layer/arm/innerproduct_arm.cpp
+++ b/src/layer/arm/innerproduct_arm.cpp
@@ -19,8 +19,8 @@
 #if __ARM_NEON
 #include <arm_neon.h>
 #include "neon_mathfun.h"
-#include "neon_activation.h"
 #endif // __ARM_NEON
+#include "neon_activation.h"
 
 namespace ncnn {
 
diff --git a/src/layer/arm/neon_activation.h b/src/layer/arm/neon_activation.h
index eb37ce46d..81676ddf0 100644
--- a/src/layer/arm/neon_activation.h
+++ b/src/layer/arm/neon_activation.h
@@ -12,7 +12,9 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
+#if __ARM_NEON
 #include <arm_neon.h>
+#endif // __ARM_NEON
 
 static inline float activation_ss(float v, int activation_type, const ncnn::Mat& activation_params)
 {
@@ -42,6 +44,7 @@ static inline float activation_ss(float v, int activation_type, const ncnn::Mat&
     return v;
 }
 
+#if __ARM_NEON
 static inline float32x4_t activation_ps(float32x4_t _v, int activation_type, const ncnn::Mat& activation_params)
 {
     if (activation_type == 1)
@@ -78,3 +81,4 @@ static inline float32x4_t activation_ps(float32x4_t _v, int activation_type, con
 
     return _v;
 }
+#endif // __ARM_NEON