You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
15 lines
665 B
15 lines
665 B
--- x265_v2.6/source/test/testharness.h.orig 2017-12-30 22:27:49.827620181 +0000 |
|
+++ x265_v2.6/source/test/testharness.h 2017-12-30 22:30:53.239500941 +0000 |
|
@@ -70,9 +70,10 @@ protected: |
|
#include <intrin.h> |
|
#elif (!defined(__APPLE__) && (defined (__GNUC__) && (defined(__x86_64__) || defined(__i386__)))) |
|
#include <x86intrin.h> |
|
-#elif ( !defined(__APPLE__) && defined (__GNUC__) && defined(__ARM_NEON__)) |
|
-#include <arm_neon.h> |
|
#elif defined(__GNUC__) && (!defined(__clang__) || __clang_major__ < 4) |
|
+#if ( !defined(__APPLE__) && defined(__ARM_NEON__)) |
|
+#include <arm_neon.h> |
|
+#endif |
|
/* fallback for older GCC/MinGW */ |
|
static inline uint32_t __rdtsc(void) |
|
{
|
|
|