From f3871ce9763d118ed7474cdfb8941ea4aef1f66e Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 31 Oct 2013 22:25:04 +0000 Subject: [PATCH] safebuffers requires vs2010 BUG=none TEST=none R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/3259004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@836 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/cpu_id.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index ef471621e..539dccf7d 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 835 +Version: 836 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index ea8ea0110..aaf1d5533 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 835 +#define LIBYUV_VERSION 836 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/cpu_id.cc b/source/cpu_id.cc index 26771ea70..61ac015d0 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -108,7 +108,7 @@ void CpuId(uint32 eax, uint32 ecx, uint32* cpu_info) { // based on libvpx arm_cpudetect.c // For Arm, but public to allow testing on any CPU -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) __declspec(safebuffers) #endif LIBYUV_API @@ -171,7 +171,7 @@ static bool TestEnv(const char*) { } #endif -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) __declspec(safebuffers) #endif LIBYUV_API