Merge pull request #3534 from taka-no-me:build_fixes

This commit is contained in:
Vadim Pisarevsky
2014-12-26 14:34:13 +00:00
12 changed files with 44 additions and 21 deletions

View File

@@ -153,7 +153,7 @@ CV_INLINE IppiSize ippiSize(const cv::Size & _size)
# include "arm_neon.h"
# define CV_NEON 1
# define CPU_HAS_NEON_FEATURE (true)
#elif defined(__ARM_NEON__)
#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
# include <arm_neon.h>
# define CV_NEON 1
# define CPU_HAS_NEON_FEATURE (true)