cpuid build fix for linux/non

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/366007

git-svn-id: http://libyuv.googlecode.com/svn/trunk@158 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2012-01-26 19:05:59 +00:00
parent e3ebe7a5cd
commit 2fc56673c1
2 changed files with 3 additions and 2 deletions

View File

@ -16,7 +16,7 @@ namespace libyuv {
extern "C" {
#endif
#define LIBYUV_VERSION 153
#define LIBYUV_VERSION 154
#ifdef __cplusplus
} // extern "C"

View File

@ -48,6 +48,7 @@ extern "C" {
#endif
// based on libvpx arm_cpudetect.c
// For Arm, but testable on any CPU
int ArmCpuCaps(const char* cpuinfoname) {
int flags = 0;
FILE* fin = fopen(cpuinfoname, "r");
@ -86,7 +87,7 @@ int InitCpuFlags() {
if (getenv("LIBYUV_DISABLE_SSSE3")) {
cpu_info_ &= ~kCpuHasSSSE3;
}
#elif if defined(__linux__) && defined(__ARM_NEON__)
#elif defined(__linux__) && defined(__ARM_NEON__)
cpu_info_ = ArmCpuCaps("/proc/cpuinfo") | kCpuInitialized;
#elif defined(__ARM_NEON__)
// gcc -mfpu=neon defines __ARM_NEON__