From f0627d7107b1218b4a6706e8add98051b3b78968 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 26 Jul 2013 01:18:25 +0000 Subject: [PATCH] syntax error fix BUG=none TEST=none R=ryanpetrie@google.com Review URL: https://webrtc-codereview.appspot.com/1883004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@741 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/cpu_id.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 2cfb3e9a3..5bd8344fb 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 740 +Version: 741 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 9d59250c1..7e033cf84 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 740 +#define LIBYUV_VERSION 741 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/cpu_id.cc b/source/cpu_id.cc index f9552fcd0..1e780f02f 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -230,7 +230,7 @@ int InitCpuFlags(void) { cpu_info_ &= ~kCpuHasMIPS_DSPR2; } #elif defined(__arm__) -#if defined(__linux__) && (defined(__ARM_NEON__) || defined(LIBYUV_NEON)) && +#if defined(__linux__) && (defined(__ARM_NEON__) || defined(LIBYUV_NEON)) && \ !defined(__native_client__) // Linux arm parse text file for neon detect. cpu_info_ = ArmCpuCaps("/proc/cpuinfo");