From 9daa550a2ee6431e45c20697f5d94924600fad85 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Tue, 20 Oct 2015 16:32:44 -0700 Subject: [PATCH] Move cpu_info variable outside ifdef Fix compile error on arm, mips etc due to undefined variable. TBR=harryjin@google.com BUG=none Review URL: https://codereview.chromium.org/1403373008 . --- 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 5fc8e276b..154ad3d97 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1516 +Version: 1517 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index b6596d6a9..7fb745aec 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 1516 +#define LIBYUV_VERSION 1517 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/cpu_id.cc b/source/cpu_id.cc index 73675ac9e..0f348af36 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -197,8 +197,8 @@ static LIBYUV_BOOL TestEnv(const char*) { LIBYUV_API SAFEBUFFERS int InitCpuFlags(void) { -#if !defined(__pnacl__) && !defined(__CLR_VER) && defined(CPU_X86) int cpu_info; +#if !defined(__pnacl__) && !defined(__CLR_VER) && defined(CPU_X86) uint32 cpu_info0[4] = { 0, 0, 0, 0 }; uint32 cpu_info1[4] = { 0, 0, 0, 0 }; uint32 cpu_info7[4] = { 0, 0, 0, 0 };