Merge pull request #7403 from tomoaki0705:fixDuplicateInclude

This commit is contained in:
Alexander Alekhin 2016-10-05 17:20:44 +00:00
commit 0f03f692a9

View File

@ -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