Merge pull request #7403 from tomoaki0705:fixDuplicateInclude

0f03f692 · Alexander Alekhin · 913b9cd6 · f6350bdf · 0f03f692
Commit 0f03f692 authored Oct 05, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

cvdef.h modules/core/include/opencv2/core/cvdef.h +0 -4

No files found.
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -223,10 +223,6 @@ enum CpuFeatures {
 #  define CV_NEON 1
 #endif

-#if defined(__ARM_NEON__) || defined(__aarch64__)
-#  include <arm_neon.h>
-#endif
-
 #if defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON__) && !defined __SOFTFP__
 #  define CV_VFP 1
 #endif